diff --git a/index.js b/index.js
index 416414c..b099da3 100644
--- a/index.js
+++ b/index.js
@@ -9,8 +9,7 @@ var ejs = require('ejs'),
 module.exports = function (source) {
   this.cacheable && this.cacheable();
 
-  var query = typeof this.query === 'object' ? this.query : utils.parseQuery(this.query);
-  var opts = merge(this.options['ejs-compiled-loader'] || {}, query);
+  var opts = merge(this.options['ejs-compiled-loader'] || {}, utils.getOptions(this));
   opts.client = true;
 
   // Skip compile debug for production when running with
diff --git a/package.json b/package.json
index 1e6e348..877d222 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "ejs": "^2.0.0",
     "html-minifier": "^3",
-    "loader-utils": "^0.2.7",
+    "loader-utils": "^1.1.0",
     "merge": "^1.2.0",
     "uglify-js": "~2.6.1"
   },