Fix issue where the query "where" was not passable through the query options, only self.