Fix bugs with the search filter/filter chain