Make website queries more efficent

didn't put info in last commit