Rewrites queries to cleaner syntax
3 files changed