make Advanced Search use klass_service methods
Fix Advanced Search
Merge branch 'master' into front-end