diff --git a/fid/config/vufind/fid.ini b/fid/config/vufind/fid.ini
index 3d2e511df3a6e584bb810e385e0419a0336324be..b2afda51e2378e9703a8e8a2395da32229830923 100644
--- a/fid/config/vufind/fid.ini
+++ b/fid/config/vufind/fid.ini
@@ -42,7 +42,7 @@ user_list_export_file_prefix = 'export'
 [OrderListUser]
 displayCols[] = 'date'
 displayCols[] = 'type'
-displayCols[] = 'user'
+;displayCols[] = 'user'
 displayCols[] = 'record'
 ;displayCols[] = 'status'
 ;displayCols[] = 'dueDate'
diff --git a/module/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php b/module/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php
index 62820effd342f0231acd95c1260595bb5cdbd051..5b5eb7ddd0b5dc1be95d34e3b64580e238e85f30 100644
--- a/module/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php
+++ b/module/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php
@@ -340,7 +340,7 @@ trait FidAcquisitionTrait
         if ($this->type == self::PDA) {
             $data += [
                 'pda' => [
-                    'comment' => $form->getData()['comment']
+                    'comment' => $form->getData()['comment'] ?? ''
                 ]
             ];
         }
diff --git a/module/fid/src/Controller/UserController.php b/module/fid/src/Controller/UserController.php
index 67297a6c6beda95405427420af7cf8045ea40330..6d7fe2ca648f294e1a259e078e519587c26afb00 100644
--- a/module/fid/src/Controller/UserController.php
+++ b/module/fid/src/Controller/UserController.php
@@ -1163,33 +1163,36 @@ class UserController extends AbstractBase
         $recordId = $order->getRecordId();
         $driver = $recordId ? $this->getRecordLoader()->load($recordId) : null;
 
-        /* @var Form $form */
-        /* @var Select $statusElement */
-        $form = $this->config[$order->getType() . "Edit"]['form']
-            ? $this->serviceLocator->get(
+        /* create form only if order type has form configuration in fid.ini */
+        if (isset($this->config[$order->getType() . "Edit"]['form'])) {
+            /* @var Form $form */
+            /* @var Select $statusElement */
+            $form = $this->serviceLocator->get(
                 'order-edit-form-' . $this->config[$order->getType() . "Edit"]['form']
-            )
-            : null;
-        $this->applyStatusOptions($form, $order->getType());
+            );
+            $this->applyStatusOptions($form, $order->getType());
 
-        if ($this->formWasSubmitted()) {
-            $form->setData($request->getPost());
-            if ($form->isValid()) {
-                return $this->updateOrder($form, $order);
+            if ($this->formWasSubmitted()) {
+                $form->setData($request->getPost());
+                if ($form->isValid()) {
+                    return $this->updateOrder($form, $order);
+                }
+            } else {
+                $form->setData($form->getHydrator()->extract($order));
             }
+
+            $action = $this->url()->fromRoute(
+                'fid/admin/editOrder',
+                [
+                    'orderid' => $order->getId()
+                ]
+            );
+            $form->setAttribute('action', $action);
+            $form->prepare();
         } else {
-            $form->setData($form->getHydrator()->extract($order));
+            $form = null;
         }
 
-        $action = $this->url()->fromRoute(
-            'fid/admin/editOrder',
-            [
-            'orderid' => $order->getId()
-            ]
-        );
-        $form->setAttribute('action', $action);
-        $form->prepare();
-
         $config = $this->config;
         $viewModel = $this->createViewModel();
         $viewModel->setVariables(compact('config', 'form', 'order', 'driver'));
diff --git a/module/fid/src/Validator/SubitoPartialCopyPageBounds.php b/module/fid/src/Validator/SubitoPartialCopyPageBounds.php
index ab6569d778a0607df54a90ad90feeab935279d04..ce67999b33bd34ac6592ea5090411e87169d3739 100644
--- a/module/fid/src/Validator/SubitoPartialCopyPageBounds.php
+++ b/module/fid/src/Validator/SubitoPartialCopyPageBounds.php
@@ -60,7 +60,7 @@ class SubitoPartialCopyPageBounds extends AbstractValidator
      *
      * @return bool
      */
-    public function isValid(string $value) : bool
+    public function isValid($value) : bool
     {
         if ($this->options['numberPages'] == null) {
             return false;
diff --git a/module/fid/src/Validator/SubitoPartialCopyPageSelection.php b/module/fid/src/Validator/SubitoPartialCopyPageSelection.php
index 59695b8319ae19c71b32a0283a7cfb4c143f8bd9..41407b05674ee2f9a124f25ec9dadf5e4be6755f 100644
--- a/module/fid/src/Validator/SubitoPartialCopyPageSelection.php
+++ b/module/fid/src/Validator/SubitoPartialCopyPageSelection.php
@@ -62,7 +62,7 @@ class SubitoPartialCopyPageSelection extends AbstractValidator
      *
      * @return bool
      */
-    public function isValid(string $value) : bool
+    public function isValid($value) : bool
     {
         if ($this->options['numberPages'] == null) {
             return false;
diff --git a/themes/fid/templates/fid/order/list/entry.phtml b/themes/fid/templates/fid/order/list/entry.phtml
index 9bd12a9706279058c6ef755f355646fb4f9fabbc..681258de574a0f14ce7ac3235b7ac6f64a246a50 100644
--- a/themes/fid/templates/fid/order/list/entry.phtml
+++ b/themes/fid/templates/fid/order/list/entry.phtml
@@ -14,7 +14,7 @@
       <?php break; ?>
     <?php case 'type': ?>
       <td>
-          <?=$this->translate("fid::acquisition_{$order->getType()}")?>
+          <?=$this->translate("fid::acquisition_" . str_replace('-', '_', $order->getType()))?>
       </td>
       <?php break; ?>
     <?php case 'date': ?>
diff --git a/themes/fid/templates/fid/order/order-edit.phtml b/themes/fid/templates/fid/order/order-edit.phtml
index aca7d567a05e4275da722a1bbbf525d27b0b7cfc..cc513e5c6b1f1b605e11b35005a0360bbcb29e87 100644
--- a/themes/fid/templates/fid/order/order-edit.phtml
+++ b/themes/fid/templates/fid/order/order-edit.phtml
@@ -27,7 +27,7 @@ $order = $this->order;
 $this->user = $order->getUser();
 /** @var Form $form */
 $form = $this->form;
-$this->headTitle($title = $this->translate("fid::acquisition_{$order->getType()}"));
+$this->headTitle($title = $this->translate("fid::acquisition_" . str_replace('-', '_', $order->getType())));
 ?>
 <h1><?= $title ?></h1>
 <?= $this->flashmessages() ?>