Add support for hupped queries