diff --git a/plugins/Tags/src/Controller/AppController.php b/plugins/Tags/src/Controller/AppController.php
index 28c7ae4..5a0bda8 100644
--- a/plugins/Tags/src/Controller/AppController.php
+++ b/plugins/Tags/src/Controller/AppController.php
@@ -9,15 +9,5 @@ class AppController extends BaseController
     public function initialize(): void
     {
         parent::initialize();
-        // $this->loadComponent('RequestHandler');
-        // $this->loadComponent('ParamHandler', [
-        //     'request' => $this->request
-        // ]);
-        // $this->loadComponent('CRUD', [
-        //     'request' => $this->request,
-        //     'table' => $this->{$this->modelClass},
-        //     'MetaFields' => $this->MetaFields,
-        //     'MetaTemplates' => $this->MetaTemplates
-        // ]);
     }
 }
\ No newline at end of file
diff --git a/src/View/Helper/TagHelper.php b/plugins/Tags/src/View/Helper/TagHelper.php
similarity index 99%
rename from src/View/Helper/TagHelper.php
rename to plugins/Tags/src/View/Helper/TagHelper.php
index c027e98..865c6b9 100644
--- a/src/View/Helper/TagHelper.php
+++ b/plugins/Tags/src/View/Helper/TagHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\View\Helper;
+namespace Tags\View\Helper;
 
 use Cake\View\Helper;
 use Cake\Utility\Hash;
diff --git a/src/View/AppView.php b/src/View/AppView.php
index 87b775b..7636a87 100644
--- a/src/View/AppView.php
+++ b/src/View/AppView.php
@@ -43,5 +43,6 @@ class AppView extends View
         $this->loadHelper('PrettyPrint');
         $this->loadHelper('FormFieldMassage');
         $this->loadHelper('Paginator', ['templates' => 'cerebrate-pagination-templates']);
+        $this->loadHelper('Tags.Tag');
     }
 }
diff --git a/templates/Organisations/index.php b/templates/Organisations/index.php
index da638cb..4a98718 100644
--- a/templates/Organisations/index.php
+++ b/templates/Organisations/index.php
@@ -71,7 +71,12 @@ echo $this->element('genericElements/IndexTable/index_table', [
             [
                 'name' => __('Type'),
                 'data_path' => 'type',
-            ]
+            ],
+            [
+                'name' => __('Tags'),
+                'data_path' => 'tags',
+                'element' => 'tags',
+            ],
         ],
         'title' => __('ContactDB Organisation Index'),
         'description' => __('A list of organisations known by your Cerebrate instance. This list can get populated either directly, by adding new organisations or by fetching them from trusted remote sources.'),