diff --git a/src/panels/lovelace/components/hui-input-list-editor.ts b/src/panels/lovelace/components/hui-input-list-editor.ts
index d80c2bd989..3d4ba45150 100644
--- a/src/panels/lovelace/components/hui-input-list-editor.ts
+++ b/src/panels/lovelace/components/hui-input-list-editor.ts
@@ -31,17 +31,17 @@ export class HuiInputListEditor extends LitElement {
         return html`
           <paper-input
             label="${this.inputLabel}"
-            .value="${listEntry}"
-            .configValue="${"entry"}"
-            .index="${index}"
-            @value-changed="${this._valueChanged}"
-            @blur="${this._consolidateEntries}"
+            .value=${listEntry}
+            .configValue=${"entry"}
+            .index=${index}
+            @value-changed=${this._valueChanged}
+            @blur=${this._consolidateEntries}
             ><ha-icon-button
               slot="suffix"
               class="clear-button"
               icon="hass:close"
               no-ripple
-              @click="${this._removeEntry}"
+              @click=${this._removeEntry}
               >Clear</ha-icon-button
             ></paper-input
           >
@@ -49,7 +49,7 @@ export class HuiInputListEditor extends LitElement {
       })}
       <paper-input
         label="${this.inputLabel}"
-        @change="${this._addEntry}"
+        @change=${this._addEntry}
       ></paper-input>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index ff7d92d3ab..714dc8deb1 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -96,36 +96,39 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
     return html`
       <div class="card-config">
         <paper-input
-          .label="${this.hass.localize(
+          .label=${this.hass.localize(
             "ui.panel.lovelace.editor.card.generic.title"
-          )} (${this.hass.localize(
+          )}
+          (${this.hass.localize(
             "ui.panel.lovelace.editor.card.config.optional"
-          )})"
-          .value="${this._title}"
-          .configValue="${"title"}"
-          @value-changed="${this._valueChanged}"
+          )})
+          .value=${this._title}
+          .configValue=${"title"}
+          @value-changed=${this._valueChanged}
         ></paper-input>
         <div class="side-by-side">
           <paper-input
-            .label="${this.hass.localize(
+            .label=${this.hass.localize(
               "ui.panel.lovelace.editor.card.generic.aspect_ratio"
-            )} (${this.hass.localize(
+            )}
+            (${this.hass.localize(
               "ui.panel.lovelace.editor.card.config.optional"
-            )})"
-            .value="${this._aspect_ratio}"
-            .configValue="${"aspect_ratio"}"
-            @value-changed="${this._valueChanged}"
+            )})
+            .value=${this._aspect_ratio}
+            .configValue=${"aspect_ratio"}
+            @value-changed=${this._valueChanged}
           ></paper-input>
           <paper-input
-            .label="${this.hass.localize(
+            .label=${this.hass.localize(
               "ui.panel.lovelace.editor.card.map.default_zoom"
-            )} (${this.hass.localize(
+            )}
+            (${this.hass.localize(
               "ui.panel.lovelace.editor.card.config.optional"
-            )})"
+            )})
             type="number"
             .value="${this._default_zoom}"
-            .configValue="${"default_zoom"}"
-            @value-changed="${this._valueChanged}"
+            .configValue=${"default_zoom"}
+            @value-changed=${this._valueChanged}
           ></paper-input>
         </div>
         <div class="side-by-side">
@@ -136,27 +139,28 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
             .dir=${computeRTLDirection(this.hass)}
           >
             <ha-switch
-              .checked="${this._dark_mode}"
-              .configValue="${"dark_mode"}"
-              @change="${this._valueChanged}"
+              .checked=${this._dark_mode}
+              .configValue=${"dark_mode"}
+              @change=${this._valueChanged}
             ></ha-switch
           ></ha-formfield>
           <paper-input
-            .label="${this.hass.localize(
+            .label=${this.hass.localize(
               "ui.panel.lovelace.editor.card.map.hours_to_show"
-            )} (${this.hass.localize(
+            )}
+            (${this.hass.localize(
               "ui.panel.lovelace.editor.card.config.optional"
-            )})"
+            )})
             type="number"
             .value="${this._hours_to_show}"
-            .configValue="${"hours_to_show"}"
-            @value-changed="${this._valueChanged}"
+            .configValue=${"hours_to_show"}
+            @value-changed=${this._valueChanged}
           ></paper-input>
         </div>
         <hui-entity-editor
           .hass=${this.hass}
-          .entities="${this._configEntities}"
-          @entities-changed="${this._entitiesValueChanged}"
+          .entities=${this._configEntities}
+          @entities-changed=${this._entitiesValueChanged}
         ></hui-entity-editor>
         <h3>
           ${this.hass.localize(
@@ -169,9 +173,9 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
               "ui.panel.lovelace.editor.card.map.source"
             )}
             .hass=${this.hass}
-            .value="${this._geo_location_sources}"
-            .configValue="${"geo_location_sources"}"
-            @value-changed="${this._valueChanged}"
+            .value=${this._geo_location_sources}
+            .configValue=${"geo_location_sources"}
+            @value-changed=${this._valueChanged}
           ></hui-input-list-editor>
         </div>
       </div>
@@ -195,14 +199,15 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
       return;
     }
     const target = ev.target! as EditorTarget;
-    if (target.configValue && this[`_${target.configValue}`] === target.value) {
+    let value = ev.detail.value;
+
+    if (target.configValue && this[`_${target.configValue}`] === value) {
       return;
     }
-    let value: any = target.value;
     if (target.type === "number") {
       value = Number(value);
     }
-    if (target.value === "" || (target.type === "number" && isNaN(value))) {
+    if (value === "" || (target.type === "number" && isNaN(value))) {
       this._config = { ...this._config };
       delete this._config[target.configValue!];
     } else if (target.configValue) {