Queries fixed