fix(Create Edit): OZF-637