diff --git a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-details.js b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-details.js
index b1626a6be9d..d0362b54f56 100644
--- a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-details.js
+++ b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-details.js
@@ -17,12 +17,13 @@
         this.configure = configure;
         this.navigateTo = navigateTo;
 
-        activate();
+        this.$onInit = activate;
 
         function activate() {
             titleService.setTitle('Configuration');
 
             var bindingId = $routeParams.bindingId;
+
             bindingRepository.getOne(function(binding) {
                 return binding.id === bindingId;
             }, function(binding) {
diff --git a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-thingtypes.js b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-thingtypes.js
index 04f6afd7808..f23e840fa1f 100644
--- a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-thingtypes.js
+++ b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/bindings/directive.binding-thingtypes.js
@@ -2,7 +2,7 @@
 (function() {
     'use strict';
 
-    angular.module('PaperUI.bindings').directive('bindingThingtypes', {
+    angular.module('PaperUI.bindings').component('bindingThingtypes', {
         bindings : {
             binding : '='
         },
@@ -12,7 +12,6 @@
 
     function BindingThingtypesController() {
         var ctrl = this;
-        this.binding;
         this.filter = {
             text : ''
         };
diff --git a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/repositories/repositories-module.js b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/repositories/repositories-module.js
index 527a06fc921..13edc8c446b 100644
--- a/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/repositories/repositories-module.js
+++ b/extensions/ui/org.eclipse.smarthome.ui.paper/web-src/js/repositories/repositories-module.js
@@ -79,15 +79,10 @@
                 getAll(null, true).then(function(res) {
                     if (callback) {
                         resolveSingleElement(callback, find(condition));
-                        return;
-                    } else {
-                        return;
                     }
                 }, function(res) {
                     callback(null);
-                    return;
                 }, function(res) {
-                    return;
                 });
             }
         }