Fix the other queries too