queries fixed; previously relied on less