AI-667 - persisted also formClass label on save