Use FacetEnum in project
Use SearchParamEnum in APD
Move further strings to constants
Add missing imports
Merge branch 'APD-95-BOZ' into develop