diff --git a/flow/src/org/labkey/flow/webparts/FlowSummary.jsp b/flow/src/org/labkey/flow/webparts/FlowSummary.jsp
index d3bd49e30a..48044a0e4f 100644
--- a/flow/src/org/labkey/flow/webparts/FlowSummary.jsp
+++ b/flow/src/org/labkey/flow/webparts/FlowSummary.jsp
@@ -237,7 +237,7 @@
                             String iconCls = StringUtils.isNotEmpty(sample.getComment()) ? FlagColumnRenderer.flagEnabledCls() : "";
                       %>
                           "<tr>" +
-                          "<td><a<%=comment%> href='<%=h(url)%>'><i class=<%=q(iconCls)%>/></a>" +
+                          "<td><a<%=comment%> href='<%=h(url)%>'><i class='<%=h(iconCls)%>'/></a>" +
                           "<td nowrap><a<%=comment%> href='<%=h(url)%>'><%=h(name)%></a>" +
                           "</tr>" +
                       <%
diff --git a/ms2/src/org/labkey/ms2/search/msTabbedSearch.jsp b/ms2/src/org/labkey/ms2/search/msTabbedSearch.jsp
index e577eff33a..f8832fcdf5 100644
--- a/ms2/src/org/labkey/ms2/search/msTabbedSearch.jsp
+++ b/ms2/src/org/labkey/ms2/search/msTabbedSearch.jsp
@@ -30,7 +30,7 @@
     boolean targetedMSModuleActive = getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule("TargetedMS"));
     String renderId = "tabbed-search-form-" + getRequestScopedUID();
 %>
-<div id=<%=q(renderId)%>></div>
+<div id="<%=h(renderId)%>"></div>
 
 <style type="text/css">