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

put this on the class so you don't have to repeat it in each method