Improved search function. Fixes #256
Merge branch '2.0_bugfix' into catalog_update