[EDIT] Corrections in queries