new queries
merge newqueries branch