diff --git a/src/Controller/AuthKeysController.php b/src/Controller/AuthKeysController.php
index 60534c02e..c0f5ae170 100644
--- a/src/Controller/AuthKeysController.php
+++ b/src/Controller/AuthKeysController.php
@@ -3,9 +3,9 @@
 namespace App\Controller;
 
 use App\Controller\AppController;
+use Cake\Core\Configure;
 use Cake\Http\Exception\MethodNotAllowedException;
 use Cake\ORM\Locator\LocatorAwareTrait;
-use Cake\Core\Configure;
 use Cake\Utility\Hash;
 
 class AuthKeysController extends AppController
@@ -30,7 +30,8 @@ class AuthKeysController extends AppController
         }
         $this->set('canCreateAuthkey', $canCreateAuthkey);
         $keyUsageEnabled = Configure::read('MISP.log_user_ips') && Configure::read('MISP.log_user_ips_authkeys');
-        $this->CRUD->index([
+        $this->CRUD->index(
+            [
             'filters' => ['Users.email', 'authkey_start', 'authkey_end', 'comment', 'Users.id'],
             'quickFilters' => ['comment', 'authkey_start', 'authkey_end', 'Users.email'],
             'conditions' => $conditions,
@@ -49,17 +50,21 @@ class AuthKeysController extends AppController
                 }
                 return $authKeys;
             }
-        ]);
+            ]
+        );
         if ($this->ParamHandler->isRest()) {
             return $this->restResponsePayload;
         }
         $this->set('title_for_layout', __('Auth Keys'));
         $this->set('advancedEnabled', !empty(Configure::read('Security.advanced_authkeys')));
         $this->set('keyUsageEnabled', $keyUsageEnabled);
-        $this->set('menuData', [
+        $this->set(
+            'menuData',
+            [
             'menuList' => $this->isSiteAdmin() ? 'admin' : 'globalActions',
             'menuItem' => 'authkeys_index',
-        ]);
+            ]
+        );
     }
 
     public function delete($id)
@@ -67,10 +72,13 @@ class AuthKeysController extends AppController
         if (!$this->__canEditAuthKey($id)) {
             throw new MethodNotAllowedException(__('Invalid user or insufficient privileges to interact with an authkey for the given user.'));
         }
-        $this->CRUD->delete($id, [
+        $this->CRUD->delete(
+            $id,
+            [
             'conditions' => $this->__prepareConditions(),
-            'contain' => ['User'],
-        ]);
+            'contain' => ['Users'],
+            ]
+        );
         if ($this->ParamHandler->isRest()) {
             return $this->restResponsePayload;
         }
@@ -81,27 +89,39 @@ class AuthKeysController extends AppController
         if (!$this->__canEditAuthKey($id)) {
             throw new MethodNotAllowedException(__('Invalid user or insufficient privileges to interact with an authkey for the given user.'));
         }
-        $this->CRUD->edit($id, [
+        $this->CRUD->edit(
+            $id,
+            [
             'conditions' => $this->__prepareConditions(),
             'afterFind' => function (\App\Model\Entity\AuthKey $authKey) {
                 return $authKey;
             },
             'fields' => ['comment', 'allowed_ips', 'expiration', 'read_only'],
             'contain' => ['Users' => ['fields' => ['id', 'org_id']]]
-        ]);
+            ]
+        );
         if ($this->ParamHandler->isRest()) {
             return $this->restResponsePayload;
         }
-        $this->set('dropdownData', [
-            'user' => $this->Users->find('list', [
+        $this->set(
+            'dropdownData',
+            [
+            'user' => $this->Users->find(
+                'list',
+                [
                 'sort' => ['username' => 'asc'],
                 'conditions' => ['id' => $this->entity['user_id']],
-            ])
-        ]);
-        $this->set('menuData', [
+                ]
+            )
+            ]
+        );
+        $this->set(
+            'menuData',
+            [
             'menuList' => $this->isSiteAdmin() ? 'admin' : 'globalActions',
             'menuItem' => 'authKeyAdd',
-        ]);
+            ]
+        );
         $this->set('edit', true);
         $this->set('validity', Configure::read('Security.advanced_authkeys_validity'));
         $this->set('title_for_layout', __('Edit auth key'));
@@ -144,29 +164,38 @@ class AuthKeysController extends AppController
             return $this->restResponsePayload;
         }
         $dropdownData = [
-            'user' => $this->AuthKeys->Users->find('list', [
+            'user' => $this->AuthKeys->Users->find(
+                'list',
+                [
                 'sort' => ['username' => 'asc'],
                 'conditions' => $selectConditions,
-            ])
+                ]
+            )
         ];
         $this->set(compact('dropdownData'));
         $this->set('title_for_layout', __('Add auth key'));
-        $this->set('menuData', [
+        $this->set(
+            'menuData',
+            [
             'menuList' => $this->isSiteAdmin() ? 'admin' : 'globalActions',
             'menuItem' => 'authKeyAdd',
-        ]);
+            ]
+        );
         $this->set('validity', Configure::read('Security.advanced_authkeys_validity'));
     }
 
     public function view($id = false)
     {
-        $this->CRUD->view($id, [
+        $this->CRUD->view(
+            $id,
+            [
             'contain' => ['Users' => ['fields' => ['id', 'email']]],
             'conditions' => $this->__prepareConditions(),
             'afterFind' => function (\App\Model\Entity\AuthKey $authKey) {
                 return $authKey;
             }
-        ]);
+            ]
+        );
         if ($this->ParamHandler->isRest()) {
             return $this->restResponsePayload;
         }
@@ -179,10 +208,13 @@ class AuthKeysController extends AppController
         }
 
         $this->set('title_for_layout', __('Auth key'));
-        $this->set('menuData', [
+        $this->set(
+            'menuData',
+            [
             'menuList' => $this->isSiteAdmin() ? 'admin' : 'globalActions',
             'menuItem' => 'authKeyView',
-        ]);
+            ]
+        );
     }
 
     public function pin($id, $ip)
@@ -241,7 +273,9 @@ class AuthKeysController extends AppController
                 return true;   // site admin is OK for all
             } else {
                 // org admin only for non-admin users and themselves
-                $user = $this->AuthKey->User->find('first', [
+                $user = $this->AuthKey->User->find(
+                    'first',
+                    [
                     'recursive' => -1,
                     'conditions' => [
                         'User.id' => $user_id,
@@ -255,7 +289,8 @@ class AuthKeysController extends AppController
                             ]
                         ]
                     ]
-                ]);
+                    ]
+                );
                 if (
                     $user['Role']['perm_site_admin'] ||
                     ($user['Role']['perm_admin'] && $user['User']['id'] !== $loggedUser->id) ||
@@ -276,12 +311,15 @@ class AuthKeysController extends AppController
 
     private function __canEditAuthKey($key_id)
     {
-        $user_id = $this->AuthKeys->find('column', [
+        $user_id = $this->AuthKeys->find(
+            'column',
+            [
             'fields' => ['user_id'],
             'conditions' => [
                 'id' => $key_id
             ]
-        ]);
+            ]
+        );
         return $this->__canCreateAuthKeyForUser($user_id);
     }
 }
diff --git a/src/Model/Table/AuthKeysTable.php b/src/Model/Table/AuthKeysTable.php
index a11777fc7..2baed4052 100644
--- a/src/Model/Table/AuthKeysTable.php
+++ b/src/Model/Table/AuthKeysTable.php
@@ -26,6 +26,9 @@ class AuthKeysTable extends AppTable
                 'propertyName' => 'User'
             ]
         );
+        // $this->addBehavior('JsonFields', [
+        //     'fields' => ['allowed_ips'],
+        // ]);
         $this->setDisplayField('comment');
     }
 
diff --git a/templates/AuthKeys/index.php b/templates/AuthKeys/index.php
index de7242d4f..6cd34c552 100644
--- a/templates/AuthKeys/index.php
+++ b/templates/AuthKeys/index.php
@@ -3,7 +3,9 @@ echo sprintf('<div%s>', empty($ajax) ? ' class="index"' : '');
 if (!$advancedEnabled) {
     echo '<div class="alert">' . __('Advanced auth keys are not enabled.') . '</div>';
 }
-echo $this->element('genericElements/IndexTable/index_table', [
+echo $this->element(
+    'genericElements/IndexTable/index_table',
+    [
     'data' => [
         'data' => $data,
         'top_bar' => [
@@ -84,32 +86,32 @@ echo $this->element('genericElements/IndexTable/index_table', [
         'actions' => [
             [
                 'url' => '/auth-keys/view',
-                'url_params_data_paths' => array(
+                'url_params_data_paths' => [
                     'id'
-                ),
+                ],
                 'icon' => 'eye',
                 'title' => 'View auth key',
             ],
             [
                 'url' => '/auth-keys/edit',
-                'url_params_data_paths' => array(
+                'url_params_data_paths' => [
                     'id'
-                ),
+                ],
                 'icon' => 'edit',
                 'title' => 'Edit auth key',
                 'requirement' => $canCreateAuthkey
             ],
             [
-                'class' => 'modal-open',
-                'url' => '/authKeys/delete',
-                'url_params_data_paths' => ['id'],
+                'open_modal' => '/authKeys/delete/[onclick_params_data_path]',
+                'modal_params_data_path' => 'id',
                 'icon' => 'trash',
                 'title' => __('Delete auth key'),
                 'requirement' => $canCreateAuthkey
             ]
         ]
     ]
-]);
+    ]
+);
 echo '</div>';
 // TODO: [3.x-MIGRATION]
 // if (empty($ajax)) {
diff --git a/templates/AuthKeys/view.php b/templates/AuthKeys/view.php
index c8610efe2..310dd1f9e 100644
--- a/templates/AuthKeys/view.php
+++ b/templates/AuthKeys/view.php
@@ -15,7 +15,9 @@ if (isset($keyUsage)) {
     $uniqueIps = null;
 }
 
-echo $this->element('genericElements/SingleViews/single_view', [
+echo $this->element(
+    'genericElements/SingleViews/single_view',
+    [
     'title' => 'Auth key view',
     'data' => $entity,
     'fields' => [
@@ -46,9 +48,9 @@ echo $this->element('genericElements/SingleViews/single_view', [
         [
             'key' => __('Allowed IPs'),
             'type' => 'custom',
-            'function' => function (array $data) {
-                if (is_array($data['allowed_ips'])) {
-                    return implode("<br />", array_map('h', $data['allowed_ips']));
+            'function' => function (\App\Model\Entity\AuthKey $authKey) {
+                if (is_array($authKey->allowed_ips)) {
+                    return implode("<br />", array_map('h', $authKey->allowed_ips));
                 }
                 return __('All');
             }
@@ -88,4 +90,5 @@ echo $this->element('genericElements/SingleViews/single_view', [
             'type' => 'authkey_pin'
         ]
     ],
-]);
+    ]
+);
diff --git a/templates/element/genericElements/SingleViews/Fields/authkeyField.php b/templates/element/genericElements/SingleViews/Fields/authkeyField.php
index 80329a626..c4a66681b 100644
--- a/templates/element/genericElements/SingleViews/Fields/authkeyField.php
+++ b/templates/element/genericElements/SingleViews/Fields/authkeyField.php
@@ -1,8 +1,7 @@
 <?php
-$authKey = $this->Hash->extract($data, $field['path']);
 echo sprintf(
     '<span class="authkey">%s</span>%s<span class="authkey">%s</span>',
-    h($authKey['authkey_start']),
+    h($data['authkey_start']),
     str_repeat('&bull;', 32),
-    h($authKey['authkey_end'])
+    h($data['authkey_end'])
 );
diff --git a/templates/element/genericElements/SingleViews/Fields/datetimeField.php b/templates/element/genericElements/SingleViews/Fields/datetimeField.php
index 292afd3a2..46ac5668f 100644
--- a/templates/element/genericElements/SingleViews/Fields/datetimeField.php
+++ b/templates/element/genericElements/SingleViews/Fields/datetimeField.php
@@ -1,3 +1,3 @@
 <?php
 $value = $this->Hash->extract($data, $field['path'])[0];
-echo $this->Time->time($value);
+echo $this->Time->format($value);