Explicitly use the value of the choice, instead of relying on __str__

netbox/extras/forms.py

@@ -61,7 +61,7 @@ def get_custom_fields_for_model(content_type, filterable_only=False, bulk_edit=F
 
         # Select
         elif cf.type == CustomFieldTypeChoices.TYPE_SELECT:
-            choices = [(cfc.pk, cfc) for cfc in cf.choices.all()]
+            choices = [(cfc.pk, cfc.value) for cfc in cf.choices.all()]
             if not cf.required or bulk_edit or filterable_only:
                 choices = [(None, '---------')] + choices
             # Check for a default choice

netbox/utilities/templatetags/helpers.py

@@ -149,9 +149,6 @@ def example_choices(field, arg=3):
             break
         if not value or not label:
             continue
-        # Handling for custom fields
-        if hasattr(label, 'value'):
-            label = label.value
         examples.append(label)
     return ', '.join(examples) or 'None'