#1063786 Person address filter not working on standard address from organisation

entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js

 import("system.vars");
 import("system.result");
 
-result.string("CONTACTID in (select CONTACT_ID from ADDRESS where "  + vars.get("$local.condition") + " )");
\ No newline at end of file
+//because the standard address can also be from the organisation, the condition is used directly here so that it applies to the joined standard
+//address and for all other addresses of the contact a subselect is necessary
+result.string("((" + vars.get("$local.condition") + ")\
+    or exists (select ADDRESS.ADDRESSID from ADDRESS where ADDRESS.CONTACT_ID = CONTACT.CONTACTID and ("  + vars.get("$local.condition") + ")))");
\ No newline at end of file