add more query support