Improve readability of trigger ID tracking config by using more getPrimaryAndMerge functionality

This is a tiny restructure of trigger FTF new JO config code to make i more robust (and less verbose). Tagging @sutt FI