Add simple where queries support