diff --git a/app/controllers/measurements/index.js b/app/controllers/measurements/index.js
index 56363a8..62d73f0 100644
--- a/app/controllers/measurements/index.js
+++ b/app/controllers/measurements/index.js
@@ -1,5 +1,5 @@
 import SortableController from '../sortable';
 
 export default SortableController.extend({
-  sortBy: 'characteristicName'
+  sortBy: 'characteristic',
 });
diff --git a/app/templates/measurements/index.hbs b/app/templates/measurements/index.hbs
index 8d43fb7..5742cee 100644
--- a/app/templates/measurements/index.hbs
+++ b/app/templates/measurements/index.hbs
@@ -9,7 +9,7 @@
     </tr>
   </thead>
   <tbody>
-    {{#each controller as |measurement|}}
+    {{#each measurement in controller}}
       {{measurements/measurement-row measurement=measurement}}
     {{/each}}
   </tbody>
diff --git a/server/mocks/measurements.js b/server/mocks/measurements.js
index bf62b51..c8cc643 100644
--- a/server/mocks/measurements.js
+++ b/server/mocks/measurements.js
@@ -6,7 +6,7 @@ module.exports = function(app) {
     {
       id: 1,
       strain: 1,
-      characteristic: 'Characteristic 1',
+      characteristic: 'α-fucosidase (API ZYM)',
       textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
@@ -20,7 +20,7 @@ module.exports = function(app) {
     {
       id: 2,
       strain: 1,
-      characteristic: 'Characteristic 2',
+      characteristic: 'α-glucosidase',
       textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
@@ -34,7 +34,7 @@ module.exports = function(app) {
     {
       id: 3,
       strain: 1,
-      characteristic: 'Characteristic 3',
+      characteristic: 'Chloramphenicol',
       textMeasurementType: null,
       txtValue: "text value",
       numValue: null,
@@ -48,7 +48,7 @@ module.exports = function(app) {
     {
       id: 4,
       strain: 1,
-      characteristic: 'Characteristic 4',
+      characteristic: 'Bacitracin',
       textMeasurementType: null,
       txtValue: null,
       numValue: 123.4,
@@ -62,7 +62,7 @@ module.exports = function(app) {
     {
       id: 5,
       strain: 1,
-      characteristic: 'Characteristic 4',
+      characteristic: 'Indole',
       textMeasurementType: null,
       txtValue: null,
       numValue: 567.8,