v2 of queries
add questions
Merge branch 'changequeries'