LPS-47236 Simplify / Decouple the dynamic data mapping custom fields JS