diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
index 735273fb42d1f5d0cdb5115f1527452df49d491b..d7c16fede4618bb21352f373cf77fe1f71fbff09 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/CrudEntityController.java
@@ -112,9 +112,9 @@ public abstract class CrudEntityController<EntityType extends CloneableEntity, F
         if (listDataTable == null) {
             return false;
         }
-        Map<String, String> filterMap = listDataTable.getFilters();
-        for (String filter : filterMap.values()) {
-            if (filter != null && !filter.isEmpty()) {
+        Map<String, Object> filterMap = listDataTable.getFilters();
+        for (Object filter : filterMap.values()) {
+            if ((String)filter != null && !((String)filter).isEmpty()) {
                 return true;
             }
         }
diff --git a/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml b/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
index a9cf352768c24aca3a3e622714fe048527a6616e..5193ff00cd1b4a7ab3e0d239910a9808a6737b4d 100644
--- a/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
+++ b/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
@@ -58,7 +58,7 @@
                                     <p:menuitem value="Home" url="/views/home.xhtml" icon="ui-icon-home"/>
                                     <p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
                                     <p:menuitem value="Users" url="/views/userInfo/list.xhtml"/>
-                                    <p:menuitem value="Login" onclick="loginDialog.show();" rendered="#{!loginController.loggedIn}" icon="ui-icon-person"/>
+                                    <p:menuitem value="Login" onclick="PF('loginDialog').show();" rendered="#{!loginController.loggedIn}" icon="ui-icon-person"/>
                                     <p:menuitem value="Logout" action="#{loginController.logout()}" rendered="#{loginController.loggedIn}" icon="ui-icon-close"/>                                </p:menubar>
                             </h:form>
                         </ui:insert>