diff --git a/assets/js/common.ts b/assets/js/common.ts
index 6884a2c..79ae519 100644
--- a/assets/js/common.ts
+++ b/assets/js/common.ts
@@ -75,7 +75,7 @@ function exec() {
 	}
 	this.output += '\n' + value
 	console.log('exec:', value)
-	sendMsg(conf, [conf.domain, this.action, this.name, data.id], data)
+	sendMsg(conf, [this.domain, this.action, this.name, data.id], data)
 }
 
 function handle(msg) {
@@ -83,7 +83,7 @@ function handle(msg) {
 	const [ domain, action, class_, item ] = msg.path.split('/')
 	//console.log('msgbase: ', domain, action, class_, item)
 	// TODO: check message parts (using default values), select handler fct
-	const comp = this.components[class_ || data]
+	const comp = this.components[class_ || 'data']
 	if (domain && domain != comp.domain) {
 		return
 	}
diff --git a/exampleSite/content/app/login.md b/exampleSite/content/app/login.md
index 1a3f1a7..9089fb0 100644
--- a/exampleSite/content/app/login.md
+++ b/exampleSite/content/app/login.md
@@ -9,6 +9,8 @@ date:   2023-03-14
 author: helmutm
 draft:  false
 weight: 100
+api:
+  domain: system
 ---
 
 cyberscopes example site - Login Form
diff --git a/layouts/shortcodes/pv/fieldset.html b/layouts/shortcodes/pv/fieldset.html
index 7d74214..16b5c20 100644
--- a/layouts/shortcodes/pv/fieldset.html
+++ b/layouts/shortcodes/pv/fieldset.html
@@ -1,6 +1,6 @@
 {{- $name := .Get "name" | default "data" -}}
 {{- $action := .Get "action" | default "data" -}}
-{{- $domain := .Get "domain" -}}
+{{- $domain := .Get "domain" | default $.Page.Params.api.domain -}}
 {{- $comp := .Get "component" | default "Data" -}}
 <div v-scope="{{ $comp }}('{{ $name }}', '{{ $action }}', '{{ $domain }}')">
 	{{ .Inner }}