Queries fixed!