made some queries more eager