add support for WHERE clause