put in a basic query support