We were mixing between things, so this is just to keep things consistent. Even though it's not strictly needed for all queries, it does look nice I think
