Restored advanced search
Merge pull request #268 from Coenego/advanced-search

Restored advanced search