Replace more searches with filters.

Where the list of possible values is small replace searches in queries
with filters. This should improve performance of the queries.

Change-Id: I3629e140dac88efbbbaed294d4869d70c6b6e008