Added correct queries