Set right apd factes fo advanced search
Merge branch 'APD-306-BOZ' into develop