Enhances Query API 

The then method accepts n intructions. Using an IDE with content assist
it's pretty annoying to have only this method because the second varag
argument will always be generated. For this reason a convenience method
was introduced that accepts only one instruction.

Change-Id: I660094431154e025415f742a0af20e0bc695dd35