diff --git a/control/control.go b/control/control.go
index 7224ff7..c9ac322 100644
--- a/control/control.go
+++ b/control/control.go
@@ -148,6 +148,7 @@ func (s *Server) dispatch(ctx context.Context, req Request) Response {
 		}
 		data, _ := json.Marshal(map[string]string{
 			"host":    params.Host,
+			"key":     params.Host,
 			"message": "Connected to " + params.Host,
 		})
 		return Response{OK: true, Data: data}
diff --git a/manifest/manifests/systemctl_is-active.yaml b/manifest/manifests/systemctl_is-active.yaml
index 66162d3..05ea4f5 100644
--- a/manifest/manifests/systemctl_is-active.yaml
+++ b/manifest/manifests/systemctl_is-active.yaml
@@ -1,6 +1,7 @@
 name: systemctl_is-active
 description: Check whether units are active
 category: services
-flags: []
+flags:
+  - flag: "--no-pager"
 stdin: false
 stdout: true
diff --git a/manifest/manifests/systemctl_is-enabled.yaml b/manifest/manifests/systemctl_is-enabled.yaml
index 1a4b221..31966e2 100644
--- a/manifest/manifests/systemctl_is-enabled.yaml
+++ b/manifest/manifests/systemctl_is-enabled.yaml
@@ -1,6 +1,7 @@
 name: systemctl_is-enabled
 description: Check whether unit files are enabled
 category: services
-flags: []
+flags:
+  - flag: "--no-pager"
 stdin: false
 stdout: true
diff --git a/manifest/manifests/systemctl_list-units.yaml b/manifest/manifests/systemctl_list-units.yaml
index 9deb9ba..03935c7 100644
--- a/manifest/manifests/systemctl_list-units.yaml
+++ b/manifest/manifests/systemctl_list-units.yaml
@@ -5,5 +5,6 @@ flags:
   - flag: "--type"
     takes_value: true
   - flag: "--failed"
+  - flag: "--no-pager"
 stdin: false
 stdout: true
diff --git a/manifest/manifests/systemctl_show.yaml b/manifest/manifests/systemctl_show.yaml
index 16c9486..2dbcbc7 100644
--- a/manifest/manifests/systemctl_show.yaml
+++ b/manifest/manifests/systemctl_show.yaml
@@ -4,5 +4,6 @@ category: services
 flags:
   - flag: "-p"
     takes_value: true
+  - flag: "--no-pager"
 stdin: false
 stdout: true