Improves single type search filter display.
Fixes selected type search not working when there's a custom predicate via @Where annotation.
Merge branch 'release/2.0'