Fixed #14334 -- Query comparision now check for object types.

`self.oc` doesn't appear to be used