diff --git a/app/View/Allowedlists/admin_add.ctp b/app/View/Allowedlists/admin_add.ctp
index 66d3423b9..8cb83a06e 100644
--- a/app/View/Allowedlists/admin_add.ctp
+++ b/app/View/Allowedlists/admin_add.ctp
@@ -9,6 +9,7 @@
                 [
                     'field' => 'name',
                     'class' => 'input-xxlarge',
+                    'type' => 'textarea'
                 ],
             ],
             'submit' => [
diff --git a/app/View/AuthKeys/add.ctp b/app/View/AuthKeys/add.ctp
index a3cd94042..71e622ce0 100644
--- a/app/View/AuthKeys/add.ctp
+++ b/app/View/AuthKeys/add.ctp
@@ -8,7 +8,8 @@ echo $this->element('genericElements/Form/genericForm', [
                 'field' => 'user_id',
                 'label' => __('User'),
                 'options' => $dropdownData['user'],
-                'type' => 'dropdown'
+                'type' => 'dropdown',
+                'class' => 'span6'
             ],
             [
                 'field' => 'comment',
diff --git a/app/View/CorrelationExclusions/add.ctp b/app/View/CorrelationExclusions/add.ctp
index 5060fd02d..2ad943fb0 100644
--- a/app/View/CorrelationExclusions/add.ctp
+++ b/app/View/CorrelationExclusions/add.ctp
@@ -8,12 +8,14 @@ echo $this->element('genericElements/Form/genericForm', [
                 'field' => 'value',
                 'label' => __('Value'),
                 'class' => 'span6',
-                'requirements' => $this->action === 'add'
+                'requirements' => $this->action === 'add',
+                'type' => 'textarea'
             ],
             [
                 'field' => 'comment',
                 'label' => __('Comment'),
                 'class' => 'span6',
+                'type' => 'textarea'
             ]
         ],
         'submit' => [
diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index 765e60f06..07a35dd28 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -51,7 +51,7 @@ if (!empty($data['fields'])) {
                 'form' => $this->Form,
                 'simpleFieldAllowlist' => $simpleFieldAllowedlist,
                 'modelForForm' => $modelForForm,
-                'fieldDesc' => empty($fieldDesc) ? [] : $fieldDesc
+                'fieldDesc' => empty($fieldDesc)? [] : $fieldDesc
             ]
         );
 
diff --git a/app/View/EventReports/add.ctp b/app/View/EventReports/add.ctp
index 1145d94e8..6ad89fcba 100644
--- a/app/View/EventReports/add.ctp
+++ b/app/View/EventReports/add.ctp
@@ -28,7 +28,8 @@
                 ),
                 array(
                     'field' => 'content',
-                    'class' => 'textarea input span6'
+                    'class' => 'span6',
+                    'type' => 'textarea'
                 ),
                 array(
                     'field' => 'event_id',
diff --git a/app/View/EventReports/ajax/replaceSuggestionInReport.ctp b/app/View/EventReports/ajax/replaceSuggestionInReport.ctp
index c3eb89ba4..5c68adabe 100644
--- a/app/View/EventReports/ajax/replaceSuggestionInReport.ctp
+++ b/app/View/EventReports/ajax/replaceSuggestionInReport.ctp
@@ -7,7 +7,7 @@
             'fields' => array(
                 array(
                     'field' => 'suggestions',
-                    'class' => 'textarea'
+                    'type' => 'textarea'
                 ),
             ),
             'submit' => array(
diff --git a/app/View/GalaxyClusterBlocklists/add.ctp b/app/View/GalaxyClusterBlocklists/add.ctp
index 3a73b7319..2f713eee4 100644
--- a/app/View/GalaxyClusterBlocklists/add.ctp
+++ b/app/View/GalaxyClusterBlocklists/add.ctp
@@ -13,6 +13,7 @@
                 array(
                     'disabled' => $action != 'add' ? 'disabled' : '',
                     'field' => 'uuids',
+                    'class' => 'span6',
                     'label' => __('Cluster UUID'),
                     'type' => 'textarea',
                     'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_uuid']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_uuid'] : '',
@@ -24,18 +25,21 @@
                 array(
                     'field' => 'cluster_orgc',
                     'label' => __('Creating organisation'),
+                    'class' => 'span6',
                     'type' => 'text',
                     'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_orgc']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_orgc'] : ''
                 ),
                 array(
                     'field' => 'cluster_info',
                     'label' => __('Cluster value'),
+                    'class' => 'span6',
                     'type' => 'text',
                     'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_info']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_info'] : ''
                 ),
                 array(
                     'field' => 'comment',
                     'label' => __('Comment'),
+                    'class' => 'span6',
                     'type' => 'text',
                     'default' => isset($blockEntry['GalaxyClusterBlocklist']['comment']) ? $blockEntry['GalaxyClusterBlocklist']['comment'] : ''
                 ),
diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index a5d7d85dc..a3cdbc130 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit a5d7d85dc8c7642197831eed5476dd0d198a8818
+Subproject commit a3cdbc1309e36c41f6a090fdb35eeebd86dff3e1
diff --git a/app/files/misp-objects b/app/files/misp-objects
index fca66ddd7..212e41025 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit fca66ddd7d955968a76b1bf485671084ff765658
+Subproject commit 212e4102586a34b523e53c926a5313050dcb478d
diff --git a/app/files/warninglists b/app/files/warninglists
index 6a454c984..29192e0b2 160000
--- a/app/files/warninglists
+++ b/app/files/warninglists
@@ -1 +1 @@
-Subproject commit 6a454c984b36fc340d8419585b8134bd5d361790
+Subproject commit 29192e0b2074a4af3f861b0a88af2e4da988a202