Fixes for queries with more than 1 filter and 1 filter as equal
Merge pull request #668 from jovanchohan/query_tck_fixes

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