#39 using __filter flags in queries
#39 removing references to _filteredData in data()
#39 using filter flag