+ [OEM-177] further fix for missing elements when saving partially complete form