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

wrap in 80 chars?