integrate new first-query and second-query classes into query view, also fix bug where demo wasn't coloring and naming queries correctly