Queries rev 1.5

And partial release of features in the 2nd release of the query form