Updated query spec to show real usage
Tidy up before I go and break it all again