Chapel or Graveside options in Disposition Merged

Around here, committal services at cemeteries are split about 50/50 between graveside services and chapel services. The way we are making that clear is by making a Service under Funeral Options called "cemetery chapel service" or "graveside service". But we also put the burial information in the Disposition (because that's where it really should go), which means it shows up twice on our calendar. Also, we're adding the information twice, which nobody loves doing.

If there were on option in Disposition after we pick the cemetery (either for burial or committal of cremated remains) to choose "Chapel", "Graveside", and maybe "Chapel with follow-out", this would avoid this double entry issue we have. This would be nice if it were a map-able entry too, so it could print on our records.