Changing tool to group maps on multiple fields. General update to scripts and templates.