Try using quoteAndRevert for regular queries

[jubeira]

In some cases we might need to batch more than one query in the same static call.

Current queries are designed for single operations within the static call, as the state is altered in that context. To avoid confusion we might as well just use quoteAndRevert.

Check bytecode size constraints and code ugliness.