diff --git a/ci/complexity_measurements/genWebpageData.py b/ci/complexity_measurements/genWebpageData.py
index 447c5fd12290b5b201884694902d637a9b1ea271..77ae645b0af09c9c83ee53c9fa5341026e421daa 100644
--- a/ci/complexity_measurements/genWebpageData.py
+++ b/ci/complexity_measurements/genWebpageData.py
@@ -426,10 +426,16 @@ def create_display_strings(
         displays.append(display)
 
     if which == "wmops_per_op":
-        assert len(displays) == 4
         # flot.js' "stack: true" depends on the order of data arrays
         # reorder here instead of reworking above loop
-        displays = [displays[0], displays[2], displays[1], displays[3]]
+        displays_encs = displays[0].split(", \n")
+        displays_decs = displays[1].split(", \n")
+        displays = [
+            displays_encs[0],
+            displays_decs[0],
+            displays_encs[1],
+            displays_decs[1],
+        ]
 
     return displays
 
diff --git a/ci/complexity_measurements/index_complexity.html b/ci/complexity_measurements/index_complexity.html
index 48e02c4f9253a095458bb03e20f9b7de94084f7d..be435b5bea3bf65c19d1f37f40dbfc0229f10525 100755
--- a/ci/complexity_measurements/index_complexity.html
+++ b/ci/complexity_measurements/index_complexity.html
@@ -665,16 +665,6 @@ function WMOPS_perOP() {
 
           text += "<b><u>Mode: " + Graphs_WMOPS_perOP.wmops_worstcase_per_op.runs[x].operatingPoint + "</u></b><br>";
 
-          text += 'Score: ' + Math.round(y * 100) / 100;
-          if (graph.direction == -1)
-            text += " WMOPS";
-          if( item.series.id == "worstCaseEnc" ){
-            text += " (enc)";
-          } 
-          if( item.series.id == "worstCaseDec" ){
-            text += " (enc + dec)";
-          } 
-          text += "<br><br>";
           text += "Worst case enc: "   + scoreEnc + " WMOPS<br>";
           text += "Worst case dec: "   + scoreDec + " WMOPS<br>";
           text += "Worst case codec: " + scoreCodec + " WMOPS<br><br>";
@@ -684,17 +674,17 @@ function WMOPS_perOP() {
         }
         else if (Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays.length == 4) {
           encData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[0];
-          decData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[2];
+          decData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[1];
 
-          encRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[1];
+          encRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[2];
           decRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[3];
 
           var x = item.datapoint[0];
           var y = item.datapoint[1];
 
           var run = Graphs_WMOPS_perOP.wmops_worstcase_per_op.runs[x];
-          var codec = run.codec;
           var op = run.operatingPoint;
+          var codec = op.split(" - ")[1];
 
           var scoreEnc, scoreDec;
 
@@ -712,18 +702,8 @@ function WMOPS_perOP() {
 
           var scoreCodec = Math.round((scoreEnc + scoreDec) * 100) / 100;
 
-          text += "<b><u>Mode: " + op + " - " + codec + "</u></b><br>";
-
-          text += 'Score: ' + Math.round(y * 100) / 100;
-          if (graph.direction == -1)
-            text += " WMOPS";
-          if( item.series.id == "worstCaseEnc" ){
-            text += " (enc)";
-          } 
-          if( item.series.id == "worstCaseDec" ){
-            text += " (enc + dec)";
-          } 
-          text += "<br><br>";
+          text += "<b><u>Mode: " + op + "</u></b><br>";
+
           text += "Worst case enc: "   + scoreEnc + " WMOPS<br>";
           text += "Worst case dec: "   + scoreDec + " WMOPS<br>";
           text += "Worst case codec: " + scoreCodec + " WMOPS<br><br>";