[OE-2716] refactored how macros are processed when loading the create form.