Merge "Improve query filtering for Search"