Working query

also added day one response, second day response and both days response
for use in tests.

strip down things being set on collector class