slight tweak to finish off #19 for real, locations are now grouped together in the form