Multi-query outputs organization now correct
4 files changed