! Remove simple search, fixes #1331

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1335 from Arantor/release-2.1

! Remove simple search, fixes #1331