moved search query parsing to keywordsearch
Merge branch 'master' of github.com:amcat/amcat