diff --git a/code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php b/code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
index 359c9289e..2491cb0d4 100644
--- a/code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
+++ b/code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
@@ -179,7 +179,7 @@ function domain_management_hook_get_db()
 
         if (isset($_GET['edit_domain'])){
         //get permissions
-        $statement = $db->executeWithoutParams("SELECT * FROM `permission` WHERE `ClientApplication` = '".$rows[$_GET['edit_domain']-1]['domain_name']."'");
+        $statement = $db->executeWithoutParams("SELECT * FROM `permission` WHERE `DomainId` = '".$rows[$_GET['edit_domain']-1]['domain_name']."'");
         $rows = $statement->fetchAll();   
         $domain_management_return_set['permissions'] = $rows;
         
diff --git a/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl b/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
index d49edc89e..489364097 100644
--- a/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
+++ b/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
@@ -196,11 +196,11 @@
 		    <tbody>
 					{foreach from=$hook_info['Domain_Management']['domains'] item=array}
 					<tr>
-						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_id']}</a></td>
+						<td>{$array['domain_id']}</td>
 						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_name']}</a></td>
-						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['status']}</a></td>
-						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['patch_version']}</a></td>
-						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['description']|truncate}</a></td>	
+						<td>{$array['status']}</td>
+						<td>{$array['patch_version']}</td>
+						<td>{$array['description']|truncate}</td>	
 					</tr>
 					{/foreach}
 	</tbody>
diff --git a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
index abd48b799..22a59d52d 100644
--- a/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ b/code/web/private_php/ams/smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -283,7 +283,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
                 if (isset($_template->_capture_stack[0][0])) {
                     $_template->capture_error();
                 }
+                error_log("test1");
                 array_shift($_template->_capture_stack);
+                error_log("test2");
                 $_output = ob_get_clean();
             } catch (Exception $e) {
                 ob_get_clean();
diff --git a/code/web/public_php/setup/version.php b/code/web/public_php/setup/version.php
index 20047997d..67ccd7243 100644
--- a/code/web/public_php/setup/version.php
+++ b/code/web/public_php/setup/version.php
@@ -1,6 +1,6 @@
 <?php
 
 // Increment whenever a web upgrade is required.
-$NEL_SETUP_VERSION = 3;
+$NEL_SETUP_VERSION = 2;
 
 /* end of file */