From 2239844c773e4587865176b5670492e08f3f509e Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Fri, 29 May 2026 13:35:45 +0300
Subject: [PATCH 1/2] add geomean summary to comparison page iff two exes and
 one env

---
 codespeed/static/js/comparison.js             | 86 +++++++++++++++++++
 codespeed/templates/codespeed/comparison.html |  1 +
 2 files changed, 87 insertions(+)

diff --git a/codespeed/static/js/comparison.js b/codespeed/static/js/comparison.js
index 48415b3e..eb67444e 100644
--- a/codespeed/static/js/comparison.js
+++ b/codespeed/static/js/comparison.js
@@ -27,6 +27,90 @@ function getConfiguration() {
   };
 }
 
+function updateGeomeanSummary(exes, enviros, bens, baseline, chart) {
+    var $summary = $("#geomean-summary");
+    if (enviros.length !== 1 || exes.length !== 2 || baseline === "none" ||
+            chart === "stacked bars" || !compdata) {
+        $summary.html("");
+        return;
+    }
+
+    var baselineExe = baseline, baselineEnv = null;
+    if (baseline.indexOf(':') !== -1) {
+        var bparts = baseline.split(':');
+        baselineExe = bparts[0];
+        baselineEnv = bparts[1];
+    }
+
+    var otherExes = exes.filter(function(e) { return e !== baselineExe; });
+    if (otherExes.length !== 1) { $summary.html(""); return; }
+    var otherExe = otherExes[0];
+
+    var envId = enviros[0];
+    var envForBase = baselineEnv !== null ? baselineEnv : envId;
+
+    var product = 1, count = 0;
+    for (var b = 0; b < bens.length; b++) {
+        var val = compdata[otherExe] && compdata[otherExe][envId]
+            ? compdata[otherExe][envId][bens[b]]
+            : null;
+        var baseval = compdata[baselineExe] && compdata[baselineExe][envForBase]
+            ? compdata[baselineExe][envForBase][bens[b]]
+            : null;
+        if (val !== null && baseval !== null && baseval !== 0 && val > 0) {
+            product *= val / baseval;
+            count++;
+        }
+    }
+
+    if (count === 0) { $summary.html(""); return; }
+
+    var geomean = Math.pow(product, 1 / count);
+
+    // Determine whether all selected benchmarks are less-is-better or more-is-better
+    var lessCount = 0, moreCount = 0;
+    var benSet = {};
+    for (var b = 0; b < bens.length; b++) { benSet[bens[b]] = true; }
+    for (var unit in bench_units) {
+        var unitBens = bench_units[unit][0];
+        var unitLess = bench_units[unit][1].indexOf("less") !== -1;
+        for (var ub = 0; ub < unitBens.length; ub++) {
+            if (benSet[unitBens[ub]]) {
+                if (unitLess) { lessCount++; } else { moreCount++; }
+            }
+        }
+    }
+
+    var otherLabel = $("label[for='exe_" + otherExe + "']").text().trim();
+    var baselineLabel = $("label[for='exe_" + baselineExe + "']").text().trim();
+    if (baselineEnv !== null) {
+        baselineLabel += ' @ ' + $("label[for='env_" + baselineEnv + "']").text().trim();
+    }
+
+    var suffix;
+    if (moreCount === 0 && lessCount > 0) {
+        // All less-is-better: ratio < 1 means faster
+        if (geomean < 1) {
+            suffix = ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> faster';
+        } else {
+            suffix = ' or <strong>' + geomean.toFixed(1) + '&times;</strong> slower';
+        }
+    } else if (lessCount === 0 && moreCount > 0) {
+        // All more-is-better: ratio > 1 means faster
+        if (geomean > 1) {
+            suffix = ' or <strong>' + geomean.toFixed(1) + '&times;</strong> faster';
+        } else {
+            suffix = ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> slower';
+        }
+    } else {
+        suffix = ' relative to baseline';
+    }
+
+    $summary.html('The geometric average of ' + count + ' benchmarks for <strong>' +
+        otherLabel + '</strong> is <strong>' + geomean.toFixed(2) + '</strong>' +
+        suffix + ' than the baseline <strong>' + baselineLabel + '</strong>');
+}
+
 function refreshContent() {
   var conf = getConfiguration(),
       exes = conf.exe.split(","),
@@ -34,6 +118,7 @@ function refreshContent() {
       enviros = conf.env.split(","),
       msg = "";
 
+  $("#geomean-summary").html("");
   var h = $("#plotwrapper").height();//get height for error message
   if (exes[0] === "") {
     $("#plotwrapper").html('<p class="warning">No executables selected</p>');
@@ -87,6 +172,7 @@ function refreshContent() {
       plotcounter++;
       renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, conf.bas, conf.chart, conf.hor);
     }
+    updateGeomeanSummary(exes, enviros, bens, conf.bas, conf.chart);
   });
 }
 
diff --git a/codespeed/templates/codespeed/comparison.html b/codespeed/templates/codespeed/comparison.html
index 075d147d..ab6ab61f 100644
--- a/codespeed/templates/codespeed/comparison.html
+++ b/codespeed/templates/codespeed/comparison.html
@@ -80,6 +80,7 @@
   <a id="permalink" href="#">Permalink</a>
   <a id="exportcsv" href="#">Export CSV</a>
 </div>
+<div id="geomean-summary" style="padding: 6px 10px; font-size: 14px;"></div>
 <div id="content" class="clearfix">
 <div id="plotwrapper"></div>
 </div>

From a37dc8daa1efc937e30876c9aa31edcaed4d128f Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Fri, 29 May 2026 18:36:34 +0300
Subject: [PATCH 2/2] simplify permalink on comparison page

---
 codespeed/static/js/comparison.js             | 202 ++++++++++--------
 codespeed/templates/codespeed/comparison.html |   6 +-
 codespeed/tests/test_views_data.py            |  40 ++--
 codespeed/views.py                            |  70 +++---
 codespeed/views_data.py                       |   4 +-
 5 files changed, 188 insertions(+), 134 deletions(-)

diff --git a/codespeed/static/js/comparison.js b/codespeed/static/js/comparison.js
index eb67444e..19ada2bc 100644
--- a/codespeed/static/js/comparison.js
+++ b/codespeed/static/js/comparison.js
@@ -16,6 +16,10 @@ var COLORS = [
 ];
 function getColor(i) { return COLORS[i % COLORS.length]; }
 
+function getExeLabel(key) {
+    return $("label[for='exe_" + key.replace(/:/g, '\\:') + "']").text().trim();
+}
+
 function getConfiguration() {
   return {
     exe: readCheckbox("input[name='executables']:checked"),
@@ -27,88 +31,84 @@ function getConfiguration() {
   };
 }
 
-function updateGeomeanSummary(exes, enviros, bens, baseline, chart) {
-    var $summary = $("#geomean-summary");
-    if (enviros.length !== 1 || exes.length !== 2 || baseline === "none" ||
-            chart === "stacked bars" || !compdata) {
-        $summary.html("");
-        return;
-    }
+function updateGraphTitle(exes, enviros, bens, baseline, chart, chartTitles) {
+    var $title = $("#graph-title");
 
-    var baselineExe = baseline, baselineEnv = null;
-    if (baseline.indexOf(':') !== -1) {
-        var bparts = baseline.split(':');
-        baselineExe = bparts[0];
-        baselineEnv = bparts[1];
-    }
+    if (enviros.length === 1 && exes.length === 2 && baseline !== "none" &&
+            chart !== "stacked bars" && compdata) {
 
-    var otherExes = exes.filter(function(e) { return e !== baselineExe; });
-    if (otherExes.length !== 1) { $summary.html(""); return; }
-    var otherExe = otherExes[0];
-
-    var envId = enviros[0];
-    var envForBase = baselineEnv !== null ? baselineEnv : envId;
-
-    var product = 1, count = 0;
-    for (var b = 0; b < bens.length; b++) {
-        var val = compdata[otherExe] && compdata[otherExe][envId]
-            ? compdata[otherExe][envId][bens[b]]
-            : null;
-        var baseval = compdata[baselineExe] && compdata[baselineExe][envForBase]
-            ? compdata[baselineExe][envForBase][bens[b]]
-            : null;
-        if (val !== null && baseval !== null && baseval !== 0 && val > 0) {
-            product *= val / baseval;
-            count++;
+        var baselineExe = baseline, baselineEnv = null;
+        if (baseline.indexOf('@') !== -1) {
+            var bparts = baseline.split('@');
+            baselineExe = bparts[0];
+            baselineEnv = bparts[1];
         }
-    }
 
-    if (count === 0) { $summary.html(""); return; }
+        var otherExes = exes.filter(function(e) { return e !== baselineExe; });
+        if (otherExes.length === 1) {
+            var otherExe = otherExes[0];
+            var envId = enviros[0];
+            var envForBase = baselineEnv !== null ? baselineEnv : envId;
+
+            var product = 1, count = 0;
+            for (var b = 0; b < bens.length; b++) {
+                var val = compdata[otherExe] && compdata[otherExe][envId]
+                    ? compdata[otherExe][envId][bens[b]]
+                    : null;
+                var baseval = compdata[baselineExe] && compdata[baselineExe][envForBase]
+                    ? compdata[baselineExe][envForBase][bens[b]]
+                    : null;
+                if (val !== null && baseval !== null && baseval !== 0 && val > 0) {
+                    product *= val / baseval;
+                    count++;
+                }
+            }
 
-    var geomean = Math.pow(product, 1 / count);
+            if (count > 0) {
+                var geomean = Math.pow(product, 1 / count);
+
+                var lessCount = 0, moreCount = 0;
+                var benSet = {};
+                for (var b = 0; b < bens.length; b++) { benSet[bens[b]] = true; }
+                for (var u in bench_units) {
+                    var unitBens = bench_units[u][0];
+                    var unitLess = bench_units[u][1].indexOf("less") !== -1;
+                    for (var ub = 0; ub < unitBens.length; ub++) {
+                        if (benSet[unitBens[ub]]) {
+                            if (unitLess) { lessCount++; } else { moreCount++; }
+                        }
+                    }
+                }
 
-    // Determine whether all selected benchmarks are less-is-better or more-is-better
-    var lessCount = 0, moreCount = 0;
-    var benSet = {};
-    for (var b = 0; b < bens.length; b++) { benSet[bens[b]] = true; }
-    for (var unit in bench_units) {
-        var unitBens = bench_units[unit][0];
-        var unitLess = bench_units[unit][1].indexOf("less") !== -1;
-        for (var ub = 0; ub < unitBens.length; ub++) {
-            if (benSet[unitBens[ub]]) {
-                if (unitLess) { lessCount++; } else { moreCount++; }
-            }
-        }
-    }
+                var otherLabel = getExeLabel(otherExe);
+                var baselineLabel = getExeLabel(baselineExe);
+                if (baselineEnv !== null) {
+                    baselineLabel += ' @ ' + $("label[for='env_" + baselineEnv + "']").text().trim();
+                }
 
-    var otherLabel = $("label[for='exe_" + otherExe + "']").text().trim();
-    var baselineLabel = $("label[for='exe_" + baselineExe + "']").text().trim();
-    if (baselineEnv !== null) {
-        baselineLabel += ' @ ' + $("label[for='env_" + baselineEnv + "']").text().trim();
-    }
+                var suffix;
+                if (moreCount === 0 && lessCount > 0) {
+                    suffix = geomean < 1
+                        ? ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> faster'
+                        : ' or <strong>' + geomean.toFixed(1) + '&times;</strong> slower';
+                } else if (lessCount === 0 && moreCount > 0) {
+                    suffix = geomean > 1
+                        ? ' or <strong>' + geomean.toFixed(1) + '&times;</strong> faster'
+                        : ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> slower';
+                } else {
+                    suffix = ' relative to baseline';
+                }
 
-    var suffix;
-    if (moreCount === 0 && lessCount > 0) {
-        // All less-is-better: ratio < 1 means faster
-        if (geomean < 1) {
-            suffix = ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> faster';
-        } else {
-            suffix = ' or <strong>' + geomean.toFixed(1) + '&times;</strong> slower';
-        }
-    } else if (lessCount === 0 && moreCount > 0) {
-        // All more-is-better: ratio > 1 means faster
-        if (geomean > 1) {
-            suffix = ' or <strong>' + geomean.toFixed(1) + '&times;</strong> faster';
-        } else {
-            suffix = ' or <strong>' + (1 / geomean).toFixed(1) + '&times;</strong> slower';
+                $title.html('The geometric average of ' + count + ' benchmarks for <strong>' +
+                    otherLabel + '</strong> is <strong>' + geomean.toFixed(2) + '</strong>' +
+                    suffix + ' than the baseline <strong>' + baselineLabel + '</strong>');
+                return;
+            }
         }
-    } else {
-        suffix = ' relative to baseline';
     }
 
-    $summary.html('The geometric average of ' + count + ' benchmarks for <strong>' +
-        otherLabel + '</strong> is <strong>' + geomean.toFixed(2) + '</strong>' +
-        suffix + ' than the baseline <strong>' + baselineLabel + '</strong>');
+    // Fall back to the chart title(s)
+    $title.text(chartTitles.join(' / '));
 }
 
 function refreshContent() {
@@ -118,7 +118,7 @@ function refreshContent() {
       enviros = conf.env.split(","),
       msg = "";
 
-  $("#geomean-summary").html("");
+  $("#graph-title").html("");
   var h = $("#plotwrapper").height();//get height for error message
   if (exes[0] === "") {
     $("#plotwrapper").html('<p class="warning">No executables selected</p>');
@@ -158,6 +158,7 @@ function refreshContent() {
   $("#plotwrapper").fadeOut("fast", function() {
     $(this).html(msg).show();
     var plotcounter = 1;
+    var chartTitles = [];
     for (var unit in bench_units) {
       var benchmarks = [];
       for (var ben in bens) {
@@ -170,9 +171,9 @@ function refreshContent() {
       var plotid = "plot" + plotcounter;
       $("#plotwrapper").append('<div class="compplot-wrap"><canvas id="' + plotid + '"></canvas></div>');
       plotcounter++;
-      renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, conf.bas, conf.chart, conf.hor);
+      chartTitles.push(renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, conf.bas, conf.chart, conf.hor));
     }
-    updateGeomeanSummary(exes, enviros, bens, conf.bas, conf.chart);
+    updateGraphTitle(exes, enviros, bens, conf.bas, conf.chart, chartTitles);
   });
 }
 
@@ -200,7 +201,7 @@ function updateBaselineDropdown() {
     if (multiEnv) {
       enviros.forEach(function(envId) {
         var envName = $("label[for='env_" + envId + "']").text().trim();
-        $baseline.append($('<option>').val(key + ':' + envId).text(name + ' @ ' + envName));
+        $baseline.append($('<option>').val(key + '@' + envId).text(name + ' @ ' + envName));
       });
     } else {
       $baseline.append($('<option>').val(key).text(name));
@@ -230,18 +231,18 @@ function loadData() {
 }
 
 function renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, baseline, chart, horizontal) {
-    // baseline may be "exe_key" or "exe_key:env_id" (for cross-env normalization)
+    // baseline may be "exe_key" or "exe_key@env_id" (for cross-env normalization)
     if (!baseline) { baseline = "none"; }
     var baselineExe = baseline, baselineEnv = null;
-    if (baseline !== "none" && baseline.indexOf(':') !== -1) {
-        var bparts = baseline.split(':');
+    if (baseline !== "none" && baseline.indexOf('@') !== -1) {
+        var bparts = baseline.split('@');
         baselineExe = bparts[0];
         baselineEnv = bparts[1];
     }
 
     var baselineLabel = "";
     if (baseline !== "none") {
-        baselineLabel = $("label[for='exe_" + baselineExe + "']").text().trim();
+        baselineLabel = getExeLabel(baselineExe);
         if (baselineEnv !== null) {
             baselineLabel += ' @ ' + $("label[for='env_" + baselineEnv + "']").text().trim();
         }
@@ -273,7 +274,7 @@ function renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, baseline,
         }
         for (var i = 0; i < exes.length; i++) {
             for (var j = 0; j < enviros.length; j++) {
-                var exeLabel = $("label[for='exe_" + exes[i] + "']").text().trim();
+                var exeLabel = getExeLabel(exes[i]);
                 if (chart === "relative bars" && exes[i] === baselineExe &&
                         (baselineEnv === null || baselineEnv === enviros[j])) { continue; }
                 var data = [];
@@ -304,7 +305,7 @@ function renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, baseline,
         // Labels = exe@env names
         for (var i = 0; i < exes.length; i++) {
             for (var j = 0; j < enviros.length; j++) {
-                var exeLabel = $("label[for='exe_" + exes[i] + "']").text().trim();
+                var exeLabel = getExeLabel(exes[i]);
                 labels.push(exeLabel + (enviros.length > 1 ? " @ " + $("label[for='env_" + enviros[j] + "']").text().trim() : ""));
             }
         }
@@ -372,7 +373,7 @@ function renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, baseline,
             responsive: true,
             maintainAspectRatio: false,
             plugins: {
-                title: {display: true, text: title, font: {size: 15}},
+                title: {display: false},
                 tooltip: {position: 'cursor'},
                 legend: {
                     position: 'right',
@@ -404,6 +405,7 @@ function renderComparisonPlot(plotid, unit, benchmarks, exes, enviros, baseline,
         }
     });
     chartInstances.push(instance);
+    return title;
 }
 
 function init(defaults) {
@@ -457,7 +459,39 @@ function init(defaults) {
     loadData();
 
     $("#permalink").click(function() {
-        window.location = "?" + $.param(getConfiguration());
+        var conf = getConfiguration();
+        var $all = $("input[name='benchmarks']");
+        var $checked = $("input[name='benchmarks']:checked");
+        if ($all.length > 0 && $all.length === $checked.length) {
+            conf.ben = 'all';
+        } else {
+            // Tally checked vs total per source
+            var sources = {};
+            $all.each(function() {
+                var src = $(this).data('source');
+                if (!sources[src]) { sources[src] = {total: 0, checked: 0}; }
+                sources[src].total++;
+                if ($(this).is(':checked')) { sources[src].checked++; }
+            });
+            var full = Object.keys(sources).filter(function(s) {
+                return sources[s].checked === sources[s].total;
+            });
+            var empty = Object.keys(sources).filter(function(s) {
+                return sources[s].checked === 0;
+            });
+            // Use source aliases only when every source is either fully selected or fully empty
+            if (full.length + empty.length === Object.keys(sources).length && full.length > 0) {
+                conf.ben = full.join(',');
+            }
+        }
+        var qs = Object.keys(conf).map(function(k) {
+            return k + '=' + encodeURIComponent(String(conf[k]))
+                .replace(/%2C/gi, ',')
+                .replace(/%3A/gi, ':')
+                .replace(/%40/gi, '@')
+                .replace(/%20/g, '+');
+        }).join('&');
+        window.location = '?' + qs;
     });
 
     $("#exportcsv").click(function(e) {
@@ -472,7 +506,7 @@ function init(defaults) {
         var header = ["benchmark"];
         for (var i = 0; i < exes.length; i++) {
             for (var j = 0; j < enviros.length; j++) {
-                var exeLabel = $("label[for='exe_" + exes[i] + "']").text().trim();
+                var exeLabel = getExeLabel(exes[i]);
                 var envLabel = $("label[for='env_" + enviros[j] + "']").text().trim();
                 header.push(enviros.length > 1 ? exeLabel + "@" + envLabel : exeLabel);
             }
diff --git a/codespeed/templates/codespeed/comparison.html b/codespeed/templates/codespeed/comparison.html
index ab6ab61f..d78550db 100644
--- a/codespeed/templates/codespeed/comparison.html
+++ b/codespeed/templates/codespeed/comparison.html
@@ -51,9 +51,9 @@
     {% for bench in benchlist|dictsort:"name" %}
     <li title="{{ bench.description }}">
       {% if bench in checkedbenchmarks %}
-        <input id="benchmark_{{ bench.id }}" type="checkbox" name="benchmarks" value="{{ bench.id }}" checked />
+        <input id="benchmark_{{ bench.id }}" type="checkbox" name="benchmarks" value="{{ bench.id }}" data-source="{{ bench.source }}" checked />
       {% else %}
-        <input id="benchmark_{{ bench.id }}" type="checkbox" name="benchmarks" value="{{ bench.id }}" />
+        <input id="benchmark_{{ bench.id }}" type="checkbox" name="benchmarks" value="{{ bench.id }}" data-source="{{ bench.source }}" />
       {% endif %}
       <label for="benchmark_{{ bench.id }}">{{ bench }}</label>
     </li>{% endfor %}
@@ -80,7 +80,7 @@
   <a id="permalink" href="#">Permalink</a>
   <a id="exportcsv" href="#">Export CSV</a>
 </div>
-<div id="geomean-summary" style="padding: 6px 10px; font-size: 14px;"></div>
+<div id="graph-title" style="text-align:center; padding:8px 0; font-size:15px;"></div>
 <div id="content" class="clearfix">
 <div id="plotwrapper"></div>
 </div>
diff --git a/codespeed/tests/test_views_data.py b/codespeed/tests/test_views_data.py
index 3bc5f6c7..8d320d87 100644
--- a/codespeed/tests/test_views_data.py
+++ b/codespeed/tests/test_views_data.py
@@ -84,29 +84,29 @@ def test_get_comparisonexes_master_default_branch(self):
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
         self.assertEqual(executables[self.project][0]['key'],
-                         '1+L+master')
+                         '1:L:master')
         self.assertEqual(executables[self.project][0]['name'],
                          'TestExecutable1 latest')
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
 
         self.assertEqual(executables[self.project][1]['key'],
-                         '2+L+master')
+                         '2:L:master')
         self.assertEqual(executables[self.project][1]['name'],
                          'TestExecutable2 latest')
 
         self.assertEqual(executables[self.project][2]['key'],
-                         '1+L+custom')
+                         '1:L:custom')
         self.assertEqual(executables[self.project][2]['name'],
                          'TestExecutable1 latest in branch \'custom\'')
 
         self.assertEqual(executables[self.project][3]['key'],
-                         '2+L+custom')
+                         '2:L:custom')
         self.assertEqual(executables[self.project][3]['name'],
                          'TestExecutable2 latest in branch \'custom\'')
 
-        self.assertEqual(exe_keys[0], '1+L+master')
-        self.assertEqual(exe_keys[1], '2+L+master')
+        self.assertEqual(exe_keys[0], '1:L:master')
+        self.assertEqual(exe_keys[1], '2:L:master')
 
     def test_get_comparisonexes_custom_default_branch(self):
         # Custom default branch is used
@@ -123,31 +123,31 @@ def test_get_comparisonexes_custom_default_branch(self):
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
         self.assertEqual(executables[self.project][0]['key'],
-                         '1+L+master')
+                         '1:L:master')
         self.assertEqual(executables[self.project][0]['name'],
                          'TestExecutable1 latest in branch \'master\'')
         self.assertEqual(executables[self.project][0]['revision'],
                          self.revision_1_master)
 
         self.assertEqual(executables[self.project][1]['key'],
-                         '2+L+master')
+                         '2:L:master')
         self.assertEqual(executables[self.project][1]['name'],
                          'TestExecutable2 latest in branch \'master\'')
 
         self.assertEqual(executables[self.project][2]['key'],
-                         '1+L+custom')
+                         '1:L:custom')
         self.assertEqual(executables[self.project][2]['name'],
                          'TestExecutable1 latest')
 
         self.assertEqual(executables[self.project][3]['key'],
-                         '2+L+custom')
+                         '2:L:custom')
         self.assertEqual(executables[self.project][3]['name'],
                          'TestExecutable2 latest')
 
-        self.assertEqual(exe_keys[0], '1+L+master')
-        self.assertEqual(exe_keys[1], '2+L+master')
-        self.assertEqual(exe_keys[2], '1+L+custom')
-        self.assertEqual(exe_keys[3], '2+L+custom')
+        self.assertEqual(exe_keys[0], '1:L:master')
+        self.assertEqual(exe_keys[1], '2:L:master')
+        self.assertEqual(exe_keys[2], '1:L:custom')
+        self.assertEqual(exe_keys[3], '2:L:custom')
 
     def test_get_comparisonexes_branch_filtering(self):
         # branch1 and branch3 have display_on_comparison_page flag set to False
@@ -169,12 +169,12 @@ def test_get_comparisonexes_branch_filtering(self):
         self.assertEqual(len(exe_keys), 6)
 
         expected_exe_keys = [
-            '1+L+master',
-            '2+L+master',
-            '1+L+custom',
-            '2+L+custom',
-            '1+L+branch2',
-            '2+L+branch2'
+            '1:L:master',
+            '2:L:master',
+            '1:L:custom',
+            '2:L:custom',
+            '1:L:branch2',
+            '2:L:branch2'
         ]
         self.assertEqual(exe_keys, expected_exe_keys)
 
diff --git a/codespeed/views.py b/codespeed/views.py
index 21928771..3b0d65d0 100644
--- a/codespeed/views.py
+++ b/codespeed/views.py
@@ -197,6 +197,32 @@ def gethistoricaldata(request):
     return HttpResponse(json.dumps(data))
 
 
+def _normalize_exe_key(key):
+    """Normalize old + separator to : for backwards URL compatibility."""
+    return key.replace('+', ':')
+
+
+def _parse_ben_param(ben_val):
+    """Parse the ben= query parameter. Returns a queryset/list or None for 'all'.
+
+    Accepts: 'all', source slugs ('legacy', 'pyperformance', 'legacy,pyperformance'),
+    or comma-separated numeric IDs (legacy behaviour).
+    """
+    if not ben_val or ben_val == 'all':
+        return None  # caller interprets None as "all benchmarks"
+    parts = [p for p in ben_val.split(',') if p]
+    source_vals = {sv for sv, _ in Benchmark.S_TYPES}
+    if parts and all(p in source_vals for p in parts):
+        return list(Benchmark.objects.filter(source__in=parts))
+    result = []
+    for i in parts:
+        try:
+            result.append(Benchmark.objects.get(id=int(i)))
+        except (Benchmark.DoesNotExist, ValueError):
+            pass
+    return result
+
+
 @require_GET
 def getcomparisondata(request):
     executables, exekeys = getcomparisonexes()
@@ -204,19 +230,15 @@ def getcomparisondata(request):
     requested_exes = None
     if 'exe' in request.GET:
         requested_exes = set(
-            i for i in request.GET['exe'].split(",") if i and i in exekeys
+            _normalize_exe_key(i) for i in request.GET['exe'].split(",")
+            if i and _normalize_exe_key(i) in exekeys
         )
 
     benchmarks = Benchmark.objects.all()
     if 'ben' in request.GET:
-        bench_ids = set()
-        for i in request.GET['ben'].split(","):
-            try:
-                bench_ids.add(int(i))
-            except ValueError:
-                pass
-        if bench_ids:
-            benchmarks = benchmarks.filter(id__in=bench_ids)
+        result = _parse_ben_param(request.GET['ben'])
+        if result is not None:
+            benchmarks = benchmarks.filter(id__in=[b.id for b in result])
 
     environments = Environment.objects.all()
 
@@ -281,19 +303,20 @@ def comparison(request):
         for i in data['exe'].split(","):
             if not i:
                 continue
+            i = _normalize_exe_key(i)
             if i in exekeys:
                 checkedexecutables.append(i)
     elif hasattr(settings, 'COMP_EXECUTABLES') and settings.COMP_EXECUTABLES:
         for exe, rev in settings.COMP_EXECUTABLES:
             try:
                 exe = Executable.objects.get(name=exe)
-                key = str(exe.id) + "+"
+                key = str(exe.id) + ":"
                 if rev == "L":
                     key += rev
                 else:
                     rev = Revision.objects.get(commitid=rev)
                     key += str(rev.id)
-                key += "+%s" % (exe.project.default_branch)
+                key += ":%s" % (exe.project.default_branch)
                 if key in exekeys:
                     checkedexecutables.append(key)
                 else:
@@ -312,7 +335,7 @@ def comparison(request):
                     proj = Project.objects.get(name=exe_spec['project'])
                     exe = Executable.objects.get(name=exe_spec['name'], project=proj)
                     for key in exekeys:
-                        if key.startswith(str(exe.id) + "+L+"):
+                        if key.startswith(str(exe.id) + ":L:"):
                             checkedexecutables.append(key)
                             break
                 except (Executable.DoesNotExist, Project.DoesNotExist):
@@ -349,14 +372,9 @@ def comparison(request):
             ]
     checkedbenchmarks = []
     if 'ben' in data:
-        checkedbenchmarks = []
-        for i in data['ben'].split(","):
-            if not i:
-                continue
-            try:
-                checkedbenchmarks.append(Benchmark.objects.get(id=int(i)))
-            except Benchmark.DoesNotExist:
-                pass
+        checkedbenchmarks = _parse_ben_param(data['ben'])
+        if checkedbenchmarks is None:
+            checkedbenchmarks = list(Benchmark.objects.all())
     if not checkedbenchmarks:
         checkedbenchmarks = Benchmark.objects.filter(default_on_comparison=True)
 
@@ -373,11 +391,13 @@ def comparison(request):
         selectedchart = settings.CHART_TYPE
 
     selectedbaseline = "none"
-    if 'bas' in data and data['bas'] in exekeys:
-        selectedbaseline = data['bas']
-    elif 'bas' in data:
-        # bas is present but is none
-        pass
+    if 'bas' in data:
+        bas = _normalize_exe_key(data['bas'])
+        if bas in exekeys:
+            selectedbaseline = bas
+        elif '@' in bas and bas.split('@')[0] in exekeys:
+            selectedbaseline = bas  # cross-env baseline: {exe_key}@{env_id}
+        # else: bas=none or unrecognised — skip NORMALIZATION default below
     elif (len(exekeys) > 1 and hasattr(settings, 'NORMALIZATION') and
             settings.NORMALIZATION):
         try:
diff --git a/codespeed/views_data.py b/codespeed/views_data.py
index ccb7ab3f..29deed9b 100644
--- a/codespeed/views_data.py
+++ b/codespeed/views_data.py
@@ -74,7 +74,7 @@ def getbaselineexecutables(include_tags=None):
         for exe in [e for e in executables if e.project == rev.branch.project]:
             exestring = get_sanitized_executable_name_for_timeline_view(exe)
             name = exestring + " " + rev.tag
-            key = str(exe.id) + "+" + str(rev.id)
+            key = str(exe.id) + ":" + str(rev.id)
             baseline.append({
                 'key': key,
                 'executable': exe,
@@ -151,7 +151,7 @@ def getcomparisonexes():
                     name = exestring + " latest"
                     if branch.name != proj.default_branch:
                         name += " in branch '" + branch.name + "'"
-                    key = str(exe.id) + "+L+" + branch.name
+                    key = str(exe.id) + ":L:" + branch.name
                     executablekeys.append(key)
                     executables.append({
                         'key': key,