diff --git a/app/models/strain.js b/app/models/strain.js
index ef5e41c..8643017 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -2,7 +2,7 @@ import DS from 'ember-data';
 import Ember from 'ember';
 
 const { Model, hasMany, belongsTo, attr } = DS;
-const { computed } = Ember;
+const { computed, String: { htmlSafe } } = Ember;
 
 export default Model.extend({
   measurements       : hasMany('measurements', { async: false }),
@@ -28,9 +28,7 @@ export default Model.extend({
     return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
   }),
 
-  // TODO: move this to component/helper
-  // Can't move until Select2 refactor
-  fullNameMU: function() {
-    return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
-  }.property('species', 'strainNameMU').readOnly(),
+  fullNameMU: computed('species', 'strainName', function() {
+    return htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
+  }),
 });