added modifiers to all types of queries
TODO: add tests