query support is almost completed