diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 8960a57ed88..dbff7e11862 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -25,7 +25,7 @@ export function registerHelper(name, fn) {
 }
 
 export function findHelper(name) {
-  return _helpers[name];
+  return _helpers[name] || _helpers[name.dasherize()];
 }
 
 export function registerHelpers(registry) {
diff --git a/app/assets/javascripts/discourse/helpers/as-hash.js.es6 b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
index caf112d3567..df5abfcdfd1 100644
--- a/app/assets/javascripts/discourse/helpers/as-hash.js.es6
+++ b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
@@ -5,8 +5,8 @@ registerHelper('as-hash', function(_, params) {
   if (Ember.Helper) { return params; }
 
   const hash = {};
-  Object.keys(params.hash).forEach(k => {
-    hash[k] = params.data.view.getStream(params.hash[k]).value();
+  Object.keys(params).forEach(k => {
+    hash[k] = params[k].value();
   });
   return hash;
 });