diff --git a/tailbone/templates/deform/select_dynamic.pt b/tailbone/templates/deform/select_dynamic.pt
index a0ee1daf..712830d1 100644
--- a/tailbone/templates/deform/select_dynamic.pt
+++ b/tailbone/templates/deform/select_dynamic.pt
@@ -26,7 +26,7 @@
     <option v-for="item in ${name}_options"
             tal:attributes=":key 'item.value';
                             :value 'item.value';">
-      {{ item.label }}
+      <span v-html="item.label"></span>
     </option>
 
   </b-select>
diff --git a/tailbone/views/custorders/orders.py b/tailbone/views/custorders/orders.py
index 563739ea..cdf765a6 100644
--- a/tailbone/views/custorders/orders.py
+++ b/tailbone/views/custorders/orders.py
@@ -341,7 +341,7 @@ class CustomerOrderView(MasterView):
             'allow_contact_info_choice': self.batch_handler.allow_contact_info_choice(),
             'allow_contact_info_create': self.batch_handler.allow_contact_info_creation(),
             'order_items': items,
-            'product_key_label': self.rattail_config.product_key_title(),
+            'product_key_label': app.get_product_key_label(),
             'allow_unknown_product': self.batch_handler.allow_unknown_product(),
             'department_options': self.get_department_options(),
             'default_uom_choices': self.batch_handler.uom_choices_for_product(None),
@@ -767,7 +767,7 @@ class CustomerOrderView(MasterView):
         if self.batch_handler.product_price_may_be_questionable():
             data['price_needs_confirmation'] = row.price_needs_confirmation
 
-        key = self.rattail_config.product_key()
+        key = app.get_product_key_field()
         if key == 'upc':
             data['product_key'] = data['product_upc_pretty']
         elif key == 'item_id':