diff --git a/tools/analysis/data-aggregator/fail-analysis-common.inc.sh b/tools/analysis/data-aggregator/fail-analysis-common.inc.sh
index e2b0ee9b..a1e4d98f 100644
--- a/tools/analysis/data-aggregator/fail-analysis-common.inc.sh
+++ b/tools/analysis/data-aggregator/fail-analysis-common.inc.sh
@@ -34,3 +34,4 @@ if [ -n "$BENCHMARK" ]; then
 		FILTER="$FILTER AND v.variant = '$VARIANT'"
 	fi
 fi
+FILTER="($FILTER)"
diff --git a/tools/analysis/data-aggregator/function-occurrences-onwrite.sh b/tools/analysis/data-aggregator/function-occurrences-onwrite.sh
index aca6a2c3..c4009295 100755
--- a/tools/analysis/data-aggregator/function-occurrences-onwrite.sh
+++ b/tools/analysis/data-aggregator/function-occurrences-onwrite.sh
@@ -44,6 +44,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY s.variant_id, s.address, r.resulttype
-ORDER BY s.address, r.resulttype
+ORDER BY s.address, CONCAT(r.resulttype)
 ;
 EOT
diff --git a/tools/analysis/data-aggregator/function-occurrences.sh b/tools/analysis/data-aggregator/function-occurrences.sh
index c02d9d7b..e7bd24b9 100755
--- a/tools/analysis/data-aggregator/function-occurrences.sh
+++ b/tools/analysis/data-aggregator/function-occurrences.sh
@@ -17,6 +17,6 @@ JOIN result_GenericExperimentMessage r
   ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY s.variant_id, s.address, r.resulttype
-ORDER BY s.address, r.resulttype
+ORDER BY s.address, CONCAT(r.resulttype)
 ;
 EOT
diff --git a/tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh b/tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh
index 8a2d7a43..ee06d4bd 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh
@@ -37,5 +37,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh b/tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh
index 054bb505..ba43d368 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh
@@ -55,6 +55,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
 ;
 EOT
diff --git a/tools/analysis/data-aggregator/resulttype-occurrences.sh b/tools/analysis/data-aggregator/resulttype-occurrences.sh
index 307c9fc8..fff1542b 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences.sh
@@ -17,5 +17,6 @@ INNER JOIN variant v
 	ON t.variant_id=v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype ASC;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh b/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
index 3d0db350..b6d27881 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
@@ -30,5 +30,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh b/tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh
index b4653faa..d1716a28 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh
@@ -34,6 +34,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
 ;
 EOT
diff --git a/tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh b/tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh
index bdf6e7e1..31820e95 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh
@@ -45,5 +45,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/symbol-occurrences.sh b/tools/analysis/data-aggregator/symbol-occurrences.sh
index 6f2fc932..9c71f82b 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences.sh
@@ -12,5 +12,6 @@ INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh b/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
index 97422f69..b47bd1bc 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
@@ -22,5 +22,6 @@ INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT
diff --git a/tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh b/tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh
index ccd4f9ca..2d491834 100755
--- a/tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh
+++ b/tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh
@@ -36,6 +36,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, f.file_id, r.resulttype
-ORDER BY v.benchmark, v.variant, f.path, r.resulttype
+ORDER BY v.benchmark, v.variant, f.path, CONCAT(r.resulttype)
 ;
 EOT
diff --git a/tools/analysis/data-aggregator/translation-unit-occurrences.sh b/tools/analysis/data-aggregator/translation-unit-occurrences.sh
index b4f88e87..f1d40afb 100755
--- a/tools/analysis/data-aggregator/translation-unit-occurrences.sh
+++ b/tools/analysis/data-aggregator/translation-unit-occurrences.sh
@@ -22,6 +22,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, f.file_id, r.resulttype
-ORDER BY v.benchmark, v.variant, f.path, r.resulttype
+ORDER BY v.benchmark, v.variant, f.path, CONCAT(r.resulttype)
 ;
 EOT