Addons should not have to be mapped to a service in order to add to a service, the mapping should be prompt/suggestions, also, having them as add on only should not prevent the ability to book like a regular service, addons must be available online and mapped is a sand trap. Adding 2 settings loosens things up ; “is available online” “is mapped to(x) service”.