cleaned up query.js, included 3 queries from concept group
heavy merge. hopefully it worked (query.js)
merge bug fixed