Fixes for search engines
Merge pull request #1887 from basilfx/searchfix

Fixes for TPB and KAT search engine