diff --git a/resources/src/main/resources/business-model/citizen_all_filters.page b/resources/src/main/resources/business-model/citizen_all_filters.page
index e320548b..84b39993 100644
--- a/resources/src/main/resources/business-model/citizen_all_filters.page
+++ b/resources/src/main/resources/business-model/citizen_all_filters.page
@@ -77840,12 +77840,18 @@
                     <entry>
                         <key>graph</key>
                         <value>
-                            <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen_education":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":340.0,"y":61.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":189.0,"y":159.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"passport":{"tableName":"passport","schemaName":"ervu_dashboard","x":119.0,"y":358.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":371.0,"y":160.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen_work_activity":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":28.0,"y":43.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":370.4000000000001,"y":272.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"recruitment1","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment1","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"target_recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"passport","refToColumns":[{"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizen_education","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizen_work_activity","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_work_activity","entity":"citizen_work_activity","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null]],"mainNodeIndex":0}</simple>
+                            <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":328.0,"y":243.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":362.0,"y":133.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":176.0,"y":152.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"passport","schemaName":"ervu_dashboard","x":126.0,"y":361.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":561.0,"y":287.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":515.0,"y":428.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":328.0,"y":243.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":362.0,"y":133.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":176.0,"y":152.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"passport","schemaName":"ervu_dashboard","x":126.0,"y":361.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":561.0,"y":287.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":515.0,"y":428.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen_education":{"tableName":"citizen_education","schemaName":"ervu_dashboard","x":362.0,"y":133.0,"alias":"citizen_education","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":328.0,"y":243.0,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"system_pgs_status"},"operation":"IS_NOT_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"passport":{"tableName":"passport","schemaName":"ervu_dashboard","x":126.0,"y":361.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":561.0,"y":287.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizen_work_activity":{"tableName":"citizen_work_activity","schemaName":"ervu_dashboard","x":176.0,"y":152.0,"alias":"citizen_work_activity","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":515.0,"y":428.0,"alias":"recruitment1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"citizen_education","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizen_work_activity","refToColumns":[{"schema":"ervu_dashboard","table":"citizen_work_activity","entity":"citizen_work_activity","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"passport","refToColumns":[{"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"recruitment1","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment1","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"target_recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null],[null,null,null,null,null,null]],"mainNodeIndex":0}</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>uniqueResult</key>
+                        <value>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>
                 <implRef type="JAVA">
-                    <className>CustomCoalesceDao</className>
+                    <className>LessJoinsDao</className>
                     <packageName>ru.micord.ervu_dashboard.dao</packageName>
                 </implRef>
             </value>