added support for $where