Improve Data.query(), add new macros to reduce typical sql boilerplate code in apps