t#31868:refact element form