Moved query.clj maps
Merge branch 'database-api-refactor' into scheduling