diff --git a/Packages/ohif-core/client/helpers/string.js b/Packages/ohif-core/client/helpers/string.js
index 19f354722..91e6af94a 100644
--- a/Packages/ohif-core/client/helpers/string.js
+++ b/Packages/ohif-core/client/helpers/string.js
@@ -17,4 +17,4 @@ Template.registerHelper('concat', (...args) => {
 });
 
 // Encode any string into a safe format for HTML id attribute
-Template.registerHelper('encodeId', string => OHIF.string.encodeId(string));
+Template.registerHelper('encodeId', OHIF.string.encodeId);
diff --git a/Packages/ohif-core/client/lib/string.js b/Packages/ohif-core/client/lib/string.js
index d23734407..438e6c1f7 100644
--- a/Packages/ohif-core/client/lib/string.js
+++ b/Packages/ohif-core/client/lib/string.js
@@ -35,7 +35,9 @@ OHIF.string.search = (object, query, property=null, result=[]) => {
 };
 
 // Encode any string into a safe format for HTML id attribute
-OHIF.string.encodeId = string => {
+OHIF.string.encodeId = input => {
+    const string = input && input.toString ? input.toString() : input;
+
     // Return an underscore if the given string is empty or if it's not a string
     if (string === '' || typeof string !== 'string') {
         return '_';
diff --git a/Packages/ohif-select-tree/client/components/selectTreeCommon/selectTreeCommon.js b/Packages/ohif-select-tree/client/components/selectTreeCommon/selectTreeCommon.js
index e0d42509b..52089f3e6 100644
--- a/Packages/ohif-select-tree/client/components/selectTreeCommon/selectTreeCommon.js
+++ b/Packages/ohif-select-tree/client/components/selectTreeCommon/selectTreeCommon.js
@@ -1,6 +1,6 @@
-import { OHIF } from 'meteor/ohif:core';
+import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { _ } from 'meteor/underscore';
+import { Tracker } from 'meteor/tracker';
 
 Template.selectTreeCommon.events({
     'click .select-tree-common label'(event, instance) {