complete query service impl
final api tweaks and initial ITs
minor mods and flexing out more ITs