diff --git a/web_client/hvueCompHIDScript.go b/web_client/hvueCompHIDScript.go
index 70a8cef..294e4f1 100644
--- a/web_client/hvueCompHIDScript.go
+++ b/web_client/hvueCompHIDScript.go
@@ -144,8 +144,8 @@ const (
 	<ransom-note v-model="ShowRansom"></ransom-note>
 
 	<modal-string-input v-model="ShowStoreHIDScriptModal" title="Store HIDScript" @save="storeHIDScript($event)"></modal-string-input>
-	<select-string-from-array :values="this.$store.state.StoredHIDScriptsList" v-model="ShowLoadHIDScriptModal" title="Load HIDScript to editor" @load="loadHIDScript($event)"></select-string-from-array>
-	<select-string-from-array :values="this.$store.state.StoredHIDScriptsList" v-model="ShowLoadHIDScriptPrependModal" title="Load HIDScript to editor" @load="loadHIDScriptPrepend($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredHIDScriptsList" v-model="ShowLoadHIDScriptModal" title="Load HIDScript to editor" @load="loadHIDScript($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredHIDScriptsList" v-model="ShowLoadHIDScriptPrependModal" title="Load HIDScript to editor" @load="loadHIDScriptPrepend($event)"></select-string-from-array>
 
 
 	<div class="row gutter-sm">
diff --git a/web_client/hvueComponentWiFi.go b/web_client/hvueComponentWiFi.go
index 7a3bacb..3fea409 100644
--- a/web_client/hvueComponentWiFi.go
+++ b/web_client/hvueComponentWiFi.go
@@ -177,8 +177,8 @@ func InitComponentsWiFi() {
 const templateWiFi = `
 <q-page padding>
 <div class="row gutter-sm">
-	<select-string-from-array :values="this.$store.state.StoredWifiSettingsList" v-model="showLoadModal" title="Load WiFi settings" @load="load($event)"></select-string-from-array>
-	<select-string-from-array :values="this.$store.state.StoredWifiSettingsList" v-model="showDeployStoredModal" title="Deploy stored WiFi settings" @load="deployStored($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredWifiSettingsList" v-model="showLoadModal" title="Load WiFi settings" @load="load($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredWifiSettingsList" v-model="showDeployStoredModal" title="Deploy stored WiFi settings" @load="deployStored($event)"></select-string-from-array>
 	<modal-string-input v-model="showStoreModal" title="Store current WiFi Settings" @save="store($event)"></modal-string-input>
 
 	<div class="col-lg-4">
diff --git a/web_client/hvueComponentsLoadTemplateModals.go b/web_client/hvueComponentsLoadTemplateModals.go
index a4b4038..4f05280 100644
--- a/web_client/hvueComponentsLoadTemplateModals.go
+++ b/web_client/hvueComponentsLoadTemplateModals.go
@@ -50,7 +50,7 @@ const templateLoadBashScript = `
 			</q-toolbar>
 
 			<q-list>
-				<q-item link tag="label" v-for="tname in this.$store.state.StoredWifiSettingsList" :key="tname">
+				<q-item link tag="label" v-for="tname in $store.state.StoredWifiSettingsList" :key="tname">
 					<q-item-side>
 						<q-radio v-model="templateName" :val="tname"/>
 					</q-item-side>
diff --git a/web_client/hvueComponentsNetwork.go b/web_client/hvueComponentsNetwork.go
index cb879b2..c29b81b 100644
--- a/web_client/hvueComponentsNetwork.go
+++ b/web_client/hvueComponentsNetwork.go
@@ -281,8 +281,8 @@ func InitComponentsNetwork() {
 
 const templateNetwork = `
 <q-page padding>
-	<select-string-from-array :values="this.$store.state.StoredEthernetInterfaceSettingsList" v-model="showLoadModal" title="Load ethernet interface settings" @load="load($event)"></select-string-from-array>
-	<select-string-from-array :values="this.$store.state.StoredEthernetInterfaceSettingsList" v-model="showDeployStoredModal" title="Deploy stored ethernet interface settings" @load="deployStored($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredEthernetInterfaceSettingsList" v-model="showLoadModal" title="Load ethernet interface settings" @load="load($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredEthernetInterfaceSettingsList" v-model="showDeployStoredModal" title="Deploy stored ethernet interface settings" @load="deployStored($event)"></select-string-from-array>
 	<modal-string-input v-model="showStoreModal" title="Store current ethernet interface Settings" @save="store($event)"></modal-string-input>
 
 	<div class="row gutter-sm">
diff --git a/web_client/hvueComponentsTriggerActions.go b/web_client/hvueComponentsTriggerActions.go
index 5c436fc..9377f4d 100644
--- a/web_client/hvueComponentsTriggerActions.go
+++ b/web_client/hvueComponentsTriggerActions.go
@@ -676,7 +676,7 @@ const templateAction = `
 			</q-item>
 
 			<q-item tag="label" v-if="isActionBashScript">
-<select-string-from-array :values="this.$store.state.StoredBashScriptsList" v-model="ShowSelectBashScriptModal" title="Select BASH script" @load="ta.ActionData.ScriptName=$event"></select-string-from-array>
+<select-string-from-array :values="$store.state.StoredBashScriptsList" v-model="ShowSelectBashScriptModal" title="Select BASH script" @load="ta.ActionData.ScriptName=$event"></select-string-from-array>
 				<q-item-main>
 					<q-item-tile label>Script path</q-item-tile>
 					<q-item-tile sublabel>Path to the BashScript which should be issued</q-item-tile>
@@ -687,7 +687,7 @@ const templateAction = `
 			</q-item>
 
 			<q-item tag="label" v-if="isActionHidScript">
-<select-string-from-array :values="this.$store.state.StoredHIDScriptsList" v-model="ShowSelectHIDScriptModal" title="Select HIDScript" @load="ta.ActionData.ScriptName=$event"></select-string-from-array>
+<select-string-from-array :values="$store.state.StoredHIDScriptsList" v-model="ShowSelectHIDScriptModal" title="Select HIDScript" @load="ta.ActionData.ScriptName=$event"></select-string-from-array>
 
 				<q-item-main>
 					<q-item-tile label>Script name</q-item-tile>
@@ -771,8 +771,8 @@ const templateAction = `
 const templateTriggerActionManager = `
 <q-page padding>
 	<modal-string-input v-model="showStoreTASModal" title="Store selected TriggerActions" @save="storeTAS($event)"></modal-string-input>
-	<select-string-from-array :values="this.$store.state.StoredTriggerActionSetsList" v-model="showReplaceTASModal" title="Replace current Trigger Actions with stored set" @load="replaceCurrentTAS($event)"></select-string-from-array>
-	<select-string-from-array :values="this.$store.state.StoredTriggerActionSetsList" v-model="showAddTASModal" title="Add stored set to current Trigger Actions" @load="addToCurrentTAS($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredTriggerActionSetsList" v-model="showReplaceTASModal" title="Replace current Trigger Actions with stored set" @load="replaceCurrentTAS($event)"></select-string-from-array>
+	<select-string-from-array :values="$store.state.StoredTriggerActionSetsList" v-model="showAddTASModal" title="Add stored set to current Trigger Actions" @load="addToCurrentTAS($event)"></select-string-from-array>
 
 	<div class="row gutter-sm">
 		<div class="col-12">