MXR-4 fix form fields