[ORB-14] edit form bugfixes