deleted filter stuff
Merge branch 'query' into fuzzy