making the order consistent between paths
simplifying the duplicate cases into the default, so we should always get an edit field even if we don't recognize the custom field type