Fix saving custom fields with same name