Stefan's changes in parsing search query for terms
Merge remote-tracking branch 'origin/master'