diff --git a/js/automation-editor/trigger/zone.js b/js/automation-editor/trigger/zone.js
index 2d5937047d..833274fa8c 100644
--- a/js/automation-editor/trigger/zone.js
+++ b/js/automation-editor/trigger/zone.js
@@ -2,10 +2,10 @@ import { h, Component } from 'preact';
 
 import { onChangeEvent } from '../../common/util/event.js';
 import { hasLocation } from '../../common/util/location.js';
-import computeDomain from '../../common/util/compute_domain.js';
+import computeStateDomain from '../../common/util/compute_state_domain.js';
 
 function zoneAndLocationFilter(stateObj) {
-  return hasLocation(stateObj) && computeDomain(stateObj) !== 'zone';
+  return hasLocation(stateObj) && computeStateDomain(stateObj) !== 'zone';
 }
 
 export default class ZoneTrigger extends Component {
diff --git a/js/common/component/condition/zone.js b/js/common/component/condition/zone.js
index 13359d0cf1..7488d7bf38 100644
--- a/js/common/component/condition/zone.js
+++ b/js/common/component/condition/zone.js
@@ -2,10 +2,10 @@ import { h, Component } from 'preact';
 
 import { onChangeEvent } from '../../util/event.js';
 import { hasLocation } from '../../util/location.js';
-import computeDomain from '../../util/compute_domain.js';
+import computeStateDomain from '../../util/compute_state_domain.js';
 
 function zoneAndLocationFilter(stateObj) {
-  return hasLocation(stateObj) && computeDomain(stateObj) !== 'zone';
+  return hasLocation(stateObj) && computeStateDomain(stateObj) !== 'zone';
 }
 
 export default class ZoneCondition extends Component {
diff --git a/panels/config/automation/ha-config-automation.html b/panels/config/automation/ha-config-automation.html
index f4769e9eb2..beda1f2834 100644
--- a/panels/config/automation/ha-config-automation.html
+++ b/panels/config/automation/ha-config-automation.html
@@ -14,13 +14,13 @@
     </style>
     <app-route
       route='[[route]]'
-      pattern='/edit/:automation'
+      pattern='/automation/edit/:automation'
       data="{{_routeData}}"
       active="{{_edittingAutomation}}"
     ></app-route>
     <app-route
       route='[[route]]'
-      pattern='/new'
+      pattern='/automation/new'
       active="{{_creatingNew}}"
     ></app-route>
 
diff --git a/panels/config/cloud/ha-config-cloud.html b/panels/config/cloud/ha-config-cloud.html
index f376d30ebc..fe5d6930a6 100644
--- a/panels/config/cloud/ha-config-cloud.html
+++ b/panels/config/cloud/ha-config-cloud.html
@@ -18,7 +18,7 @@
     </style>
     <app-route
       route='[[route]]'
-      pattern='/:page'
+      pattern='/cloud/:page'
       data="{{_routeData}}"
       tail="{{_routeTail}}"
     ></app-route>
@@ -32,7 +32,7 @@
     </template>
 
     <template is='dom-if' if='[[!account]]' restamp>
-      <template is='dom-if' if='[[_isLoginPage(_routeData.page)]]' restamp>
+      <template is='dom-if' if='[[_equals(_routeData.page, "login")]]' restamp>
         <ha-config-cloud-login
           page-name='login'
           hass='[[hass]]'
@@ -41,7 +41,7 @@
         ></ha-config-cloud-login>
       </template>
 
-      <template is='dom-if' if='[[_isRegisterPage(_routeData.page)]]' restamp>
+      <template is='dom-if' if='[[_equals(_routeData.page, "register")]]' restamp>
         <ha-config-cloud-register
           page-name='register'
           hass='[[hass]]'
@@ -50,7 +50,7 @@
         ></ha-config-cloud-register>
       </template>
 
-      <template is='dom-if' if='[[_isForgotPasswordPage(_routeData.page)]]' restamp>
+      <template is='dom-if' if='[[_equals(_routeData.page, "forgot-password")]]' restamp>
         <ha-config-cloud-forgot-password
           page-name='forgot-password'
           hass='[[hass]]'
@@ -63,51 +63,53 @@
 </dom-module>
 
 <script>
-class HaConfigCloud extends window.hassMixins.NavigateMixin(Polymer.Element) {
-  static get is() { return 'ha-config-cloud'; }
+{
+  class HaConfigCloud extends window.hassMixins.NavigateMixin(Polymer.Element) {
+    static get is() { return 'ha-config-cloud'; }
 
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      loadingAccount: {
-        type: Boolean,
-        value: false
-      },
-      account: {
-        type: Object,
-        value: null,
-      },
+    static get properties() {
+      return {
+        hass: Object,
+        isWide: Boolean,
+        loadingAccount: {
+          type: Boolean,
+          value: false
+        },
+        account: {
+          type: Object,
+          value: null,
+        },
 
-      route: Object,
+        route: Object,
 
-      _routeData: Object,
-      _routeTail: Object,
-      _loginEmail: String,
-    };
-  }
+        _routeData: Object,
+        _routeTail: Object,
+        _loginEmail: String,
+      };
+    }
 
-  static get observers() {
-    return [
-      '_checkRoute(route, account)'
-    ];
-  }
+    static get observers() {
+      return [
+        '_checkRoute(route, account)'
+      ];
+    }
 
-  _checkRoute(route, account) {
-    if (!route || route.prefix !== '/config/cloud') return;
+    _checkRoute(route, account) {
+      if (!route || route.path.substr(0, 6) !== '/cloud') return;
 
-    if (!account && ['/forgot-password', '/register'].indexOf(route.path) === -1) {
-      this.navigate('/config/cloud/login', true);
-    } else if (account &&
-               ['/login', '/register', '/forgot-password'].indexOf(route.path) !== -1) {
-      this.navigate('/config/cloud/account', true);
+      if (!account && ['/cloud/forgot-password', '/cloud/register'].indexOf(route.path) === -1) {
+        this.navigate('/config/cloud/login', true);
+      } else if (account &&
+                 ['/cloud/login', '/cloud/register', '/cloud/forgot-password'].indexOf(route.path) !== -1) {
+        this.navigate('/config/cloud/account', true);
+      }
+    }
+
+    _equals(a, b) {
+      return a === b;
     }
   }
 
-  _isRegisterPage(page) { return page === 'register'; }
-  _isForgotPasswordPage(page) { return page === 'forgot-password'; }
-  _isLoginPage(page) { return page === 'login'; }
+  customElements.define(HaConfigCloud.is, HaConfigCloud);
 }
-
-customElements.define(HaConfigCloud.is, HaConfigCloud);
 </script>
diff --git a/panels/config/ha-panel-config.html b/panels/config/ha-panel-config.html
index 2b5b6b45b2..d74d5130b4 100644
--- a/panels/config/ha-panel-config.html
+++ b/panels/config/ha-panel-config.html
@@ -25,7 +25,6 @@
       route='[[route]]'
       pattern='/:page'
       data="{{_routeData}}"
-      tail="{{_routeTail}}"
     ></app-route>
 
     <iron-media-query query="(min-width: 1040px)" query-matches="{{wide}}">
@@ -47,7 +46,7 @@
 
       <ha-config-cloud
         page-name='cloud'
-        route='[[_routeTail]]'
+        route='[[route]]'
         hass='[[hass]]'
         is-wide='[[isWide]]'
         account='[[account]]'
@@ -64,14 +63,14 @@
 
       <ha-config-automation
         page-name='automation'
-        route='[[_routeTail]]'
+        route='[[route]]'
         hass='[[hass]]'
         is-wide='[[isWide]]'
       ></ha-config-automation>
 
       <ha-config-script
         page-name='script'
-        route='[[_routeTail]]'
+        route='[[route]]'
         hass='[[hass]]'
         is-wide='[[isWide]]'
       ></ha-config-script>
@@ -117,7 +116,6 @@ class HaPanelConfig extends window.hassMixins.EventsMixin(Polymer.Element) {
       },
 
       _routeData: Object,
-      _routeTail: Object,
 
       wide: Boolean,
       wideSidebar: Boolean,
diff --git a/panels/config/script/ha-config-script.html b/panels/config/script/ha-config-script.html
index 6d9f87b01a..86b6ca1d85 100644
--- a/panels/config/script/ha-config-script.html
+++ b/panels/config/script/ha-config-script.html
@@ -14,13 +14,13 @@
     </style>
     <app-route
       route='[[route]]'
-      pattern='/edit/:script'
+      pattern='/script/edit/:script'
       data="{{_routeData}}"
       active="{{_edittingScript}}"
     ></app-route>
     <app-route
       route='[[route]]'
-      pattern='/new'
+      pattern='/script/new'
       active="{{_creatingNew}}"
     ></app-route>
 
diff --git a/src/components/entity/ha-entity-picker.html b/src/components/entity/ha-entity-picker.html
index 25973b1f0a..f56ef61293 100644
--- a/src/components/entity/ha-entity-picker.html
+++ b/src/components/entity/ha-entity-picker.html
@@ -30,6 +30,7 @@
         autofocus="[[autofocus]]"
         label="[[label]]"
         class="input"
+        value='[[value]]'
         disabled='[[disabled]]'
       >
         <paper-icon-button
diff --git a/src/components/ha-combo-box.html b/src/components/ha-combo-box.html
index 03d4fa6b4a..1be00a835c 100644
--- a/src/components/ha-combo-box.html
+++ b/src/components/ha-combo-box.html
@@ -27,6 +27,7 @@
         autofocus="[[autofocus]]"
         label="[[label]]"
         class="input"
+        value='[[value]]'
       >
         <paper-icon-button
           slot="suffix"
diff --git a/src/components/ha-service-picker.html b/src/components/ha-service-picker.html
index 602abf74e5..7c87d7a67f 100644
--- a/src/components/ha-service-picker.html
+++ b/src/components/ha-service-picker.html
@@ -30,6 +30,8 @@ class HaServicePicker extends Polymer.Element {
   _computeServices(hass) {
     const result = [];
 
+    if (!hass) return result;
+
     Object.keys(hass.config.services).sort().forEach((domain) => {
       const services = Object.keys(hass.config.services[domain]).sort();