Further Query Edits