Change field order in template for add_subtracks
Improve functionality: signal/peak track detection

Some submissions do not have both a signal and a peak track; this commit
adds the ability to detect which are present and will update the stanza
appropriately.