diff --git a/core/data/Main/WebRss.txt b/core/data/Main/WebRss.txt
index 86da5d8810..47b7f2ced0 100644
--- a/core/data/Main/WebRss.txt
+++ b/core/data/Main/WebRss.txt
@@ -1,8 +1,8 @@
-%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
-<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
+<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
 %IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
-  <link>%SCRIPTURL{"view"}%/%WEB%</link>
+  <link>%SCRIPTURL{"view" web="%WEB%"}%</link>
   <description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
 %INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
    * Set SKIN = rss
diff --git a/core/data/Sandbox/WebRss.txt b/core/data/Sandbox/WebRss.txt
index 3c2896a5fa..47b7f2ced0 100644
--- a/core/data/Sandbox/WebRss.txt
+++ b/core/data/Sandbox/WebRss.txt
@@ -1,7 +1,8 @@
-%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
-<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
+%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
+%META:TOPICPARENT{name="WebHome"}%
+<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
 %IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
-  <link>%SCRIPTURL{"view"}%/%WEB%</link>
+  <link>%SCRIPTURL{"view" web="%WEB%"}%</link>
   <description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
 %INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
    * Set SKIN = rss
diff --git a/core/data/System/AppendixCascadingStyleSheets.txt b/core/data/System/AppendixCascadingStyleSheets.txt
index 8ddda42254..37b9596873 100644
--- a/core/data/System/AppendixCascadingStyleSheets.txt
+++ b/core/data/System/AppendixCascadingStyleSheets.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1489206078" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490666627" format="1.1" version="1"}%
 %META:TOPICPARENT{name="DeveloperDocumentationCategory"}%
 %STARTINCLUDE%
 ---+ Appendix C: CSS
@@ -214,7 +214,7 @@ Markers to invoke behaviour with unobtrusive !JavaScript.
 #TestFoswikiFocus
 ---++++ Troubleshooting foswikiFocus
    * Test for loading error of focus plugin (no message means ok): %JQREQUIRE{"focus"}%
-   * [[%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" testfocus="1"}%#TestFoswikiFocus][Test foswikiFocus]]
+   * [[%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" testfocus="1" #="TestFoswikiFocus"}%][Test foswikiFocus]]
 
 %IF{"$'URLPARAM{testfocus}'='1'" then="
 $percntJQREQUIRE{$quotfocus$quot}$percnt
diff --git a/core/data/System/WebRss.txt b/core/data/System/WebRss.txt
index a7fecf355e..47b7f2ced0 100644
--- a/core/data/System/WebRss.txt
+++ b/core/data/System/WebRss.txt
@@ -1,8 +1,8 @@
-%META:TOPICINFO{author="ProjectContributor" date="1394718139" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
-<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
+<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
 %IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
-  <link>%SCRIPTURL{"view"}%/%WEB%</link>
+  <link>%SCRIPTURL{"view" web="%WEB%"}%</link>
   <description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
 %INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
    * Set SKIN = rss
diff --git a/core/data/Trash/WebHome.txt b/core/data/Trash/WebHome.txt
index d5e453cba2..e55541f125 100644
--- a/core/data/Trash/WebHome.txt
+++ b/core/data/Trash/WebHome.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1433037425" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1490664179" format="1.1" version="1"}%
 ---+!! %MAKETEXT{"Welcome to the [_1] web" args="<nop>%WEB%"}%
 %MAKETEXT{"This is the Trash. Here you can undelete topics; deleted attachments are in TrashAttachment." args="<b><nop>%WEB%</b>"}% 
 
@@ -12,7 +12,7 @@ Last 15 changes in this web:
 [[WebChanges][%MAKETEXT{"more..."}%]]
 
 ---++ <nop>%WEB% Web Utilities
-<form action='%SCRIPTURLPATH{"search"}%/%WEB%/'>
+<form action='%SCRIPTURLPATH{"search" web="%WEB%"}%'>
    * <input type="text" name="search" size="22" />&nbsp;<input type="submit" class="foswikiSubmit" value="Search" /> - [[WebSearchAdvanced][advanced search]]
    * WebTopicList - all topics in alphabetical order
    * WebChanges - recent topic changes in this web
diff --git a/core/data/Trash/WebRss.txt b/core/data/Trash/WebRss.txt
index 3c2896a5fa..47b7f2ced0 100644
--- a/core/data/Trash/WebRss.txt
+++ b/core/data/Trash/WebRss.txt
@@ -1,7 +1,8 @@
-%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
-<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
+%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
+%META:TOPICPARENT{name="WebHome"}%
+<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
 %IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
-  <link>%SCRIPTURL{"view"}%/%WEB%</link>
+  <link>%SCRIPTURL{"view" web="%WEB%"}%</link>
   <description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
 %INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
    * Set SKIN = rss
diff --git a/core/data/_default/WebRss.txt b/core/data/_default/WebRss.txt
index 3c2896a5fa..47b7f2ced0 100644
--- a/core/data/_default/WebRss.txt
+++ b/core/data/_default/WebRss.txt
@@ -1,7 +1,8 @@
-%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
-<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
+%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
+%META:TOPICPARENT{name="WebHome"}%
+<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
 %IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
-  <link>%SCRIPTURL{"view"}%/%WEB%</link>
+  <link>%SCRIPTURL{"view" web="%WEB%"}%</link>
   <description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
 %INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
    * Set SKIN = rss