query

query and filter changes