simpler query management
v0.1.1