Document Mappings - Service Info by Event Type

When mapping Event/Service Information to forms, there are currently so many different mappings that are named slightly inconsistently, that it's difficult to know what to select or search for, and some options aren't even available for every service type.

So, when Mapping a Form, I think that since (nearly) every event type has the same fields in Passare (Date, Start/End Time, Address, Notes, etc.,) it would be good to be able to select the Service Type in an initial dropdown which would create a secondary (or tiered) dropdown to select the appropriate Service Information from.

Then there would only need to be one Universal set of Service Information Mappings to choose from that would apply to any given Event Type, even if new Event Types are created.

Something like this:

[%DECNAME%] - - - - - - - - - - - - - - - - - - - - | Select |

[%MASS_DATE%] - - - - - - - - - - - - - - - - - - -| Event Type - Mass 1 |

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ [ Date ]

[%FAMILYVIEWING_DATE%] - - - - - - - - - - - - | Event Type - Family Viewing 1 |

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ [ Date ]

[%MASS2_DATE%] - - - - - - - - - - - - - - - - - -| Event Type - Mass 2 |

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ [ Date ]

[%PRIVATE_VISITATION_TIME%] - - - - - - - - - -| Event Type - Family Viewing 2 |

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ [ Start Time ]

[%PUBLICVISITATION_ENDTIME%] - - - - - - - - | Event Type - Public Viewing 1 |

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ [ End Time ]

As for how this could be set up, I'm not positive what it looks like behind the scenes currently, or if this next part is easily doable, but if every event has the same fields, I would suggest giving each of those fields some sort of system ID. Then the universal mappings could identify which service type first, then pull the information from the appropriate fields based on the IDs.

Hopefully that makes sense.