Revert "Support for advanced searching"

This reverts commit 4f9fa97fd4e6f867ca155c15bbe75e6d1f4f00e1.