--- a/src/main/webapp/statistics.xhtml
+++ b/src/main/webapp/statistics.xhtml
@@ -22,7 +22,8 @@
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:p="http://primefaces.org/ui"
       xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets">
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:head>
 </h:head>
 
@@ -31,88 +32,136 @@
         <ui:define name="section">Statistics</ui:define>
         <ui:define name="content">
             <p:tabView id="panel">
-                <p:tab title="Tool alternatives">
-                    <p>Tool count: #{statisticsBean.allTools.size()}</p>
+                <p:tab title="Tool alternatives (SameActionStrategy)">
+                    <c:set var="sb1" value="#{toolActionStatisticsBean}" scope="request" />
+                    <p>Tool count: #{sb1.allTools.size()}</p>
 
                     <p>Sum:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getSum()}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getSum()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Min:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getMin()}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getMin()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Max:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getMax()}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getMax()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Mean:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getMean()}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getMean()}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
                     <p>Median:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getPercentile(50)}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getPercentile(50)}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
                     <p>Standard Deviation:
-                        <h:outputText value="#{statisticsBean.getToolAlternativeStatistics().getStandardDeviation()}">
+                        <h:outputText value="#{sb1.getAlternativeStatistics().getStandardDeviation()}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
 
-                    <p:lineChart id="tool_stats" value="#{statisticsBean.toolAlternativesChartModel}" legendPosition="e"
+                    <p:lineChart id="tool_stats" value="#{sb1.alternativesChartModel}" legendPosition="e"
                                  zoom="true" animate="true"
                                  title="Number of alternatives per tool" minY="0"
-                                 maxY="#{statisticsBean.getToolAlternativeStatistics().getMax() + statisticsBean.round(statisticsBean.getToolAlternativeStatistics().getMax() * 0.05)}"
-                                 minX="#{-statisticsBean.round(statisticsBean.allTools.size() * 0.01)}" maxX="#{statisticsBean.allTools.size() + statisticsBean.round(statisticsBean.allTools.size() * 0.01)}"
+                                 maxY="#{sb1.getAlternativeStatistics().getMax() + sb1.round(sb1.getAlternativeStatistics().getMax() * 0.05)}"
+                                 minX="#{-sb1.round(sb1.allTools.size() * 0.01)}" maxX="#{sb1.allTools.size() + sb1.round(sb1.allTools.size() * 0.01)}"
                                  style="height:300px" widgetVar="tool_stats"/>
                     <p:commandButton type="button" value="Reset" icon="ui-icon-cancel"
                                      onclick="PF('tool_stats').resetZoom()"/>
                 </p:tab>
-                <p:tab title="Format alternatives">
-                    <p>Format count: #{statisticsBean.allFormatIDs.size()}</p>
+
+                <p:tab title="Tool alternatives (SameFreebaseGenreStrategy)">
+                    <c:set var="sb2" value="#{toolGenreStatisticsBean}" scope="request" />
+                    <p>Tool count: #{sb2.allTools.size()}</p>
 
                     <p>Sum:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getSum()}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getSum()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Min:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getMin()}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getMin()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Max:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getMax()}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getMax()}">
                             <f:convertNumber pattern="0;(0)"/>
                         </h:outputText>
                     </p>
                     <p>Mean:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getMean()}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getMean()}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
                     <p>Median:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getPercentile(50)}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getPercentile(50)}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
                     <p>Standard Deviation:
-                        <h:outputText value="#{statisticsBean.getFormatAlternativeStatistics().getStandardDeviation()}">
+                        <h:outputText value="#{sb2.getAlternativeStatistics().getStandardDeviation()}">
                             <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
                         </h:outputText>
                     </p>
 
-                    <p:lineChart id="format_stats" value="#{statisticsBean.formatAlternativesChartModel}"
-                                 legendPosition="e" zoom="true" animate="true"
-                                 title="Number of alternatives per format" minY="0"
-                                 maxY="#{statisticsBean.getFormatAlternativeStatistics().getMax() + statisticsBean.round(statisticsBean.getFormatAlternativeStatistics().getMax() * 0.05)}"
-                                 minX="#{-statisticsBean.round(statisticsBean.allFormatIDs.size() * 0.01)}" maxX="#{statisticsBean.allFormatIDs.size() + statisticsBean.round(statisticsBean.allFormatIDs.size() * 0.01)}"
+                    <p:lineChart id="tool_genre_stats" value="#{sb2.alternativesChartModel}" legendPosition="e"
+                                 zoom="true" animate="true"
+                                 title="Number of alternatives per tool" minY="0"
+                                 maxY="#{sb2.getAlternativeStatistics().getMax() + sb2.round(sb2.getAlternativeStatistics().getMax() * 0.05)}"
+                                 minX="#{-sb2.round(sb2.allTools.size() * 0.01)}" maxX="#{sb2.allTools.size() + sb2.round(sb2.allTools.size() * 0.01)}"
+                                 style="height:300px" widgetVar="tool_genre_stats"/>
+                    <p:commandButton type="button" value="Reset" icon="ui-icon-cancel"
+                                     onclick="PF('tool_genre_stats').resetZoom()"/>
+                </p:tab>
+
+                <p:tab title="Format alternatives">
+                    <c:set var="sb3" value="#{formatStatisticsBean}" scope="request" />
+                    <p>Format count: #{sb3.allFormatIDs.size()}</p>
+
+                    <p>Sum:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getSum()}">
+                            <f:convertNumber pattern="0;(0)"/>
+                        </h:outputText>
+                    </p>
+                    <p>Min:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getMin()}">
+                            <f:convertNumber pattern="0;(0)"/>
+                        </h:outputText>
+                    </p>
+                    <p>Max:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getMax()}">
+                            <f:convertNumber pattern="0;(0)"/>
+                        </h:outputText>
+                    </p>
+                    <p>Mean:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getMean()}">
+                            <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
+                        </h:outputText>
+                    </p>
+                    <p>Median:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getPercentile(50)}">
+                            <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
+                        </h:outputText>
+                    </p>
+                    <p>Standard Deviation:
+                        <h:outputText value="#{sb3.getAlternativeStatistics().getStandardDeviation()}">
+                            <f:convertNumber pattern="#,##0.00;(#,##0.00)"/>
+                        </h:outputText>
+                    </p>
+
+                    <p:lineChart id="format_stats" value="#{sb3.alternativesChartModel}" legendPosition="e"
+                                 zoom="true" animate="true"
+                                 title="Number of alternatives per tool" minY="0"
+                                 maxY="#{sb3.getAlternativeStatistics().getMax() + sb3.round(sb3.getAlternativeStatistics().getMax() * 0.05)}"
+                                 minX="#{-sb3.round(sb3.allFormatIDs.size() * 0.01)}" maxX="#{sb3.allFormatIDs.size() + sb3.round(sb3.allFormatIDs.size() * 0.01)}"
                                  style="height:300px" widgetVar="format_stats"/>
                     <p:commandButton type="button" value="Reset" icon="ui-icon-cancel"
                                      onclick="PF('format_stats').resetZoom()"/>