Add support for question queries