SQUASH with drop chartype

app/pods/protected/characteristics/controller.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'],
+  sortParams: ['characteristicTypeName', 'sortOrder'],
   sortedCharacteristics: Ember.computed.sort('model', 'sortParams'),
 });

app/pods/protected/characteristics/template.hbs

@@ -13,7 +13,7 @@
     {{#each sortedCharacteristics as |row|}}
       <tr>
         <td>{{row.characteristicName}}</td>
-        <td>{{row.characteristicType.characteristicTypeName}}</td>
+        <td>{{row.characteristicTypeName}}</td>
         <td>{{row.sortOrder}}</td>
       </tr>
     {{/each}}