Fix bad merge which removed advanced search
Merge pull request #491 from opinkerfi/fix-advanced-search-rebase

Fix bad merge which removed advanced search