added IN and Filters support
refactored modify queries