Supported edit fields fix