[ADD] preliminary query support