Initial query support working