diff --git a/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js b/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
index 70a7d2b4ff92bcdf4473cc664fc123c03d5232d7..ce1720c3ffe0f670716f3b02b602918729fa588c 100644
--- a/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
@@ -1,4 +1,4 @@
 
 jQuery(document).ready(function() {
-    experimentTypeListWidget.filter();
+    PF('experimentTypeListWidget').filter();
 });
diff --git a/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js b/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js
new file mode 100644
index 0000000000000000000000000000000000000000..856a97111d8d5d85a6081b1082b7cc62a1bf1c2a
--- /dev/null
+++ b/src/java/DmWebPortal/web/resources/js/roleType/list.filter.js
@@ -0,0 +1,6 @@
+
+jQuery(document).ready(function() {
+    PF('roleTypeListWidget').filter();
+});
+
+
diff --git a/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js b/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
index 491c0c3ba0efd507857193c50412879e65c07c58..b7634e986fa14ecebf8e2c96139b99a7cd7eb860 100644
--- a/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
@@ -1,4 +1,4 @@
 
 jQuery(document).ready(function() {
-    userInfoListWidget.filter();
+    PF('userInfoListWidget').filter();
 });
\ No newline at end of file
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
index 2a297bcd48a605348685008e33803183899fbb78..50572560f20b5993e6ca56b04a14be7184dae795 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
@@ -8,7 +8,7 @@
                      header="Destroy Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
                      styleClass="dialog">
         <p:commandButton value="Yes" oncomplete="experimentTypeDestroyDialogWidget.hide()" action="#{experimentTypeController.destroy()}"/>
-        <p:commandButton value="No" onclick="experimentTypeDestroyDialogWidget.hide()" type="button" />
+        <p:commandButton value="No" onclick="PF('experimentTypeDestroyDialogWidget').hide()" type="button" />
     </p:confirmDialog>  
 </ui:composition>
 
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
index 9c253d488899fa7d2bbd923d803725690cf69920..ab7152b089cffb1b9f45cc7e61ad4f0c55df2552 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
@@ -42,7 +42,7 @@
             <div class="actionLink">
                 <p:commandLink action="#{experimentTypeController.prepareView(experimentTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
                 <p:commandLink action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
-                <p:commandLink oncomplete="experimentTypeDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                <p:commandLink oncomplete="PF('experimentTypeDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
                     <f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
                 </p:commandLink>
             </div>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
index 80ac67fdb4a8e6025c296756440350febdf3049d..88cc199ae6312f65d23f637dd261f2a03d379a06 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
@@ -8,6 +8,6 @@
                      header="Destroy RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
                      styleClass="dialog">
         <p:commandButton value="Yes" oncomplete="roleTypeDestroyDialogWidget.hide()" action="#{roleTypeController.destroy()}"/>
-        <p:commandButton value="No" onclick="roleTypeDestroyDialogWidget.hide()" type="button" />
+        <p:commandButton value="No" onclick="PF('roleTypeDestroyDialogWidget').hide()" type="button" />
     </p:confirmDialog>  
 </ui:composition>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
index 672cf7dc78f7b4f01a627b967e39004692a68bfe..f84c579d796f1b66434454a5b2a92510e2abe474 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
@@ -38,7 +38,7 @@
             <div class="actionLink">
                 <p:commandLink action="#{roleTypeController.prepareView(roleTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
                 <p:commandLink action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
-                <p:commandLink oncomplete="roleTypeDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                <p:commandLink oncomplete="PF('roleTypeDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
                     <f:setPropertyActionListener value="#{roleTypeObject}" target="#{roleTypeController.current}"/>
                 </p:commandLink>
             </div>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
index 4ca615378dc2df75ebd25a51a4633fbdbae4f31a..bd51dce30edd070188d7c2994d87a85f618563f3 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
@@ -8,7 +8,7 @@
                      header="Destroy User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
                      styleClass="dialog">
         <p:commandButton value="Yes" oncomplete="userInfoDestroyDialogWidget.hide()" action="#{userInfoController.destroy()}"/>
-        <p:commandButton value="No" onclick="userInfoDestroyDialogWidget.hide()" type="button" />
+        <p:commandButton value="No" onclick="PF('userInfoDestroyDialogWidget').hide()" type="button" />
     </p:confirmDialog>  
 </ui:composition>
 
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
index c6b5b928c9bddadc78a22e23f82e32f5dc4568c5..ff53c8e5068fe4637439305fb616c2953a002f8b 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml
@@ -57,7 +57,7 @@
             <div class="actionLink">
                 <p:commandLink action="#{userInfoController.prepareView(userInfoObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
                 <p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
-                <p:commandLink oncomplete="userInfoDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                <p:commandLink oncomplete="PF('userInfoDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
                     <f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
                 </p:commandLink>
             </div>