queries fixed