APD-220: Revise advanced search page
APD-220: post review fix
Merge branch 'APD-220' into develop