APD-520: Refactoring facets in advanced search
Merge branch 'APD-520-BOZ' into develop