Improved search performance
Merge pull request #305 from GrygrFlzr/master

Improved search performance