@@ -990,7 +990,7 @@ protected function watcherScriptsToSave($screen)
         $watcherList = [];
         foreach ($screen->watchers as $watcher) {
             $script = $watcher->script;
-            $watcher->script_id = $script->id;
+            $watcher->script_id = str_replace(['script-', 'data_source-'], '', $script->id);
             $watcher->script->title = $script->title;
             $watcherList[] = $watcher;
         }
Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ protected function watcherScriptsToSave($screen)`
`990`	`990`	`$watcherList = [];`
`991`	`991`	`foreach ($screen->watchers as $watcher) {`
`992`	`992`	`$script = $watcher->script;`
`993`		`- $watcher->script_id = $script->id;`
	`993`	`+ $watcher->script_id = str_replace(['script-', 'data_source-'], '', $script->id);`
`994`	`994`	`$watcher->script->title = $script->title;`
`995`	`995`	`$watcherList[] = $watcher;`
`996`	`996`	`}`