Separated search
Follow up on review

As discussed with Tim, only a follow-up was done for the non-aquabrowser issues, since this functionality needs to be rewritten anyway.
Follow-up on review
Merge pull request #226 from Coenego/improve-search

Separated search