diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 0ddb87512..9a5520f06 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1102,7 +1102,7 @@ FW_addLinks($)
 {
   my ($txt) = @_;
   return undef if(!defined($txt));
-  $txt =~ s,\s([a-z0-9._]+)\s,
+  $txt =~ s,\b([a-z0-9._]+)\b,
             $defs{$1} ? "<a href='$FW_ME$FW_subdir?detail=$1'>$1</a>" : $1,gei;
   return $txt;
 }
diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm
index d4ca7028f..13709d8ca 100644
--- a/fhem/FHEM/98_SVG.pm
+++ b/fhem/FHEM/98_SVG.pm
@@ -366,6 +366,8 @@ SVG_PEdit($$$$)
   return "" if( $pe eq 'never' );
 
   my $gpf = $defs{$d}{GPLOTFILE};
+  my $link = "$FW_ME?cmd=style edit $gpf.gplot".
+               (configDBUsed() ? " configDB" : "").$FW_CSRF;
   my $gp = "$FW_gplotdir/$gpf.gplot";
   my $pm = AttrVal($d,"plotmode",$FW_plotmode);
 
@@ -569,8 +571,7 @@ EOF
   });
   setTimeout(function(){
     \$("table.internals div[informid=$gpf-GPLOTFILE]").each(function(){
-      \$(this).html(
-        "<a href='$FW_ME?cmd=style edit $gpf.gplot&fwcsrf=$FW_CSRF'>$gpf</a>");
+      \$(this).html("<a href='$link'>$gpf</a>");
     }) }, 10);
 </script>
 EOF