Some minors corrections
Correction on Query methods object return