diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py
index 1e54663862..6186732ff2 100644
--- a/InvenTree/common/views.py
+++ b/InvenTree/common/views.py
@@ -195,7 +195,7 @@ class FileManagementFormView(MultiStepFormView):
     def get_context_data(self, form, **kwargs):
         context = super().get_context_data(form=form, **kwargs)
 
-        if self.steps.current == 'fields' or self.steps.current == 'items':
+        if self.steps.current in ('fields', 'items'):
             
             # Get columns and row data
             self.columns = self.file_manager.columns()
@@ -333,20 +333,34 @@ class FileManagementFormView(MultiStepFormView):
                     'errors': {},
                 })
         else:
+            if self.column_names:
+                rows_shown = []
+
             # Update the row data
             for row in self.rows:
                 row_data = row['data']
 
                 data = []
+                show_data = []
 
                 for idx, item in enumerate(row_data):
-                    data.append({
+                    column_data = {
                         'cell': item,
                         'idx': idx,
                         'column': self.columns[idx],
-                    })
-            
+                    }
+                    data.append(column_data)
+                    if not self.column_names or self.columns[idx]['name'] in self.column_names:
+                        show_data.append(column_data)
+
                 row['data'] = data
+                if self.column_names:
+                    current_row = row
+                    current_row['data'] = show_data
+                    rows_shown.append(current_row)
+
+            if self.column_names and self.get_step_index() == 3:
+                self.rows = rows_shown
 
         # In the item selection step: update row data to contain fields
         if form and self.steps.current == 'items':
@@ -435,7 +449,7 @@ class FileManagementFormView(MultiStepFormView):
         }
 
         # Data validation
-        valid = len(self.extra_context_data.get('missing_columns', [])) == 0 and not self.extra_context_data.get('duplicates', [])
+        valid = not missing_columns and not duplicates
 
         return valid
 
@@ -452,7 +466,7 @@ class FileManagementFormView(MultiStepFormView):
             valid = self.check_field_selection(form)
 
             if not valid:
-                form.add_error(None, 'Fields matching failed')
+                form.add_error(None, _('Fields matching failed'))
 
         elif step == 'items':
             pass
diff --git a/InvenTree/order/templates/order/order_wizard/match_parts.html b/InvenTree/order/templates/order/order_wizard/match_parts.html
index e6cb565a5b..aa9776085f 100644
--- a/InvenTree/order/templates/order/order_wizard/match_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/match_parts.html
@@ -63,16 +63,16 @@
                 {% for item in row.data %}
                 <td>
                     {% if item.column.guess == 'Quantity' %}
-                    {% for field in form.visible_fields %}
-                        {% if field.name == row.quantity_select %}
-                            {{ field }}
+                        {% for field in form.visible_fields %}
+                            {% if field.name == row.quantity_select %}
+                                {{ field }}
+                            {% endif %}
+                        {% endfor %}
+                        {% if row.errors.quantity %}
+                            <p class='help-inline'>{{ row.errors.quantity }}</p>
                         {% endif %}
-                    {% endfor %}
-                    {% if row.errors.quantity %}
-                    <p class='help-inline'>{{ row.errors.quantity }}</p>
-                    {% endif %}
                     {% else %}
-                    {{ item.cell }}
+                        {{ item.cell }}
                     {% endif %}
                     <input type='hidden' name='row_{{ row.index }}_col_{{ forloop.counter0 }}' value='{{ item.cell }}'/>
                 </td>
diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html
index 129570417b..84a28cf0a3 100644
--- a/InvenTree/order/templates/order/order_wizard/po_upload.html
+++ b/InvenTree/order/templates/order/order_wizard/po_upload.html
@@ -14,7 +14,7 @@
 
 {% block details %}
 
-<p>{% trans "Step" %} {{ wizard.steps.step1 }} {% trans "of" %} {{ wizard.steps.count }} 
+<p>{% blocktrans with step=wizard.steps.step1 count=wizard.steps.count %}Step {{step}} of {{count}}{% endblocktrans %}
 {% if description %}- {{ description }}{% endif %}</p>
 
 {% block form_alert %}