Made the 7 queries more explicit