Improved search queries (and case insensitive).

fixes #311