Revert "Even more search improvements - 2nd attempt :)"
Merge pull request #369 from codeeu/revert-359-fea_search_get2

Revert "Even more search improvements - 2nd attempt :)"