Fixes for queries with more than 1 filter and 1 filter as equal