diff --git a/src/Controller/InstanceController.php b/src/Controller/InstanceController.php
index 5caf6ee..e641940 100644
--- a/src/Controller/InstanceController.php
+++ b/src/Controller/InstanceController.php
@@ -38,6 +38,7 @@ class InstanceController extends AppController
         $searchValue = $this->request->getQuery('search');
         $model = $this->request->getQuery('model', null);
         $limit = $this->request->getQuery('limit', 5);
+        $limit = is_numeric($limit) ? $limit : 5;
         if (!empty($this->request->getQuery('show_all', false))) {
             $limit = null;
         }
diff --git a/src/Model/Table/InstanceTable.php b/src/Model/Table/InstanceTable.php
index 624fe7a..afd04e0 100644
--- a/src/Model/Table/InstanceTable.php
+++ b/src/Model/Table/InstanceTable.php
@@ -81,7 +81,7 @@ class InstanceTable extends AppTable
         return $statistics;
     }
 
-    public function searchAll($value, $user, $limit=5, $model=null)
+    public function searchAll($value, $user, int $limit=5, $model=null)
     {
         $results = [];
         $models = $this->seachAllTables;
diff --git a/templates/Broods/add.php b/templates/Broods/add.php
index 6069870..f5666d2 100644
--- a/templates/Broods/add.php
+++ b/templates/Broods/add.php
@@ -1,5 +1,4 @@
 <?php
-    $modelForForm = 'Individuals';
     echo $this->element('genericElements/Form/genericForm', array(
         'data' => array(
             'description' => __('Individuals are natural persons. They are meant to describe the basic information about an individual that may or may not be a user of this community. Users in genral require an individual object to identify the person behind them - however, no user account is required to store information about an individual. Individuals can have affiliations to organisations and broods as well as cryptographic keys, using which their messages can be verified and which can be used to securely contact them.'),
diff --git a/templates/MetaTemplateNameDirectory/index.php b/templates/MetaTemplateNameDirectory/index.php
index 0b57d8c..1575091 100644
--- a/templates/MetaTemplateNameDirectory/index.php
+++ b/templates/MetaTemplateNameDirectory/index.php
@@ -46,10 +46,14 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'sort' => 'meta_template.id',
                 'data_path' => 'meta_template.id',
                 'element' => 'function',
-                'function' => function($row, $viewContext) {
-                    return $viewContext->Bootstrap::node('a', [
-                        'href' => h($baseurl . '/metaTemplates/view/' . $row->meta_template->id ?? ''),
-                    ], !empty($row->meta_template->name) ? (sprintf('%s (v%s)', h($row->meta_template->name), h($row->meta_template->version))) :'');
+                'function' => function($row, $viewContext) use ($baseurl) {
+                    if (!empty($row->meta_template)) {
+                        return $viewContext->Bootstrap->node('a', [
+                            'href' => h($baseurl . '/metaTemplates/view/' . $row->meta_template->id ?? ''),
+                        ], !empty($row->meta_template->name) ? (sprintf('%s (v%s)', h($row->meta_template->name), h($row->meta_template->version))) :'');
+                    } else {
+                        return '';
+                    }
                 }
             ],
         ],
diff --git a/templates/element/genericElements/Form/formInfo.php b/templates/element/genericElements/Form/formInfo.php
index d569142..39b60fe 100644
--- a/templates/element/genericElements/Form/formInfo.php
+++ b/templates/element/genericElements/Form/formInfo.php
@@ -2,19 +2,10 @@
     $seed = mt_rand();
     if (!is_array($fieldDesc)) {
         $fieldDesc = array('info' => $fieldDesc);
-        $default = 'info';
     } else {
-        if (!empty($field['options'])) {
-            if (isset($this->request->data[$modelForForm][$field['field']])) {
-                $default = $this->request->data[$modelForForm][$field['field']];
-            } else {
-                reset($field['options']);
-                $default = key($field['options']);
-            }
-        } else {
+        if (empty($field['options'])) {
             reset($fieldDesc);
             $fieldDesc = array('info' => key($fieldDesc));
-            $default = 'info';
         }
     }
     $popoverID = sprintf("%sInfoPopover%s", h($field['field']), $seed);
@@ -39,7 +30,7 @@
                             .text('<?php echo h(\Cake\Utility\Inflector::humanize($field['field'])); ?>')
                     )
                     .append(
-                        $('<span>').text(": <?= h($fieldDesc["info"]) ?>")
+                        $('<span>').text(": <?= h($fieldDesc["info"] ?? '') ?>")
                     );
                 // var tempSelector = '#<?php echo h($modelForForm . \Cake\Utility\Inflector::camelize($field['field'])); ?>';
                 // if ($(tempSelector)[0].nodeName === "SELECT" && Object.keys(fieldDesc).length > 1) {