Cleaned up implementation of search filters. Fix #2151.
Merge pull request #2215 from jezdez/search-parameter-names

Cleaned up search implementation of filters.