query support fixed