Fix search queries containing spaces.
Merge branch 'tischlda-search'