the two queries are now merged into one view - working on just query button now