diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js b/config/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js
index 4c72774cc4..b623515c83 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js
@@ -29,8 +29,12 @@ function findNodeInSite()
    var node = site.getContainer(containerId);
    if (node === null)
    {
-      status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
-      return null;
+      node = site.createContainer(containerId);
+      if (node === null)
+      {
+      	status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
+     	return null;
+      }
    }
    
    // try to fetch the the path is there is any
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml
index e139449d80..bbc1ac129d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml
@@ -3,6 +3,6 @@
   <description>Get the membership details for a user</description>
   <url>/api/sites/{shortname}/memberships/{username}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml
index e139449d80..bbc1ac129d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml
@@ -3,6 +3,6 @@
   <description>Get the membership details for a user</description>
   <url>/api/sites/{shortname}/memberships/{username}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml
index e139449d80..bbc1ac129d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml
@@ -3,6 +3,6 @@
   <description>Get the membership details for a user</description>
   <url>/api/sites/{shortname}/memberships/{username}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml
index 5d72719316..935880cb15 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml
@@ -3,6 +3,6 @@
   <description>Get a colleciton of a sites memberships.</description>
   <url>/api/sites/{shortname}/memberships?nf={namefilter?}&amp;rf={rolefilter?}&amp;size={pagesize?}&amp;pos={position?}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml
index 82c1a1beee..35f3e5ccfb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml
@@ -3,6 +3,6 @@
   <description>Adds a new membership to the site</description>
   <url>/api/sites/{shortname}/memberships</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml
index c63cba2100..5e423efede 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml
@@ -3,6 +3,6 @@
   <description>Delete the details of a site.</description>
   <url>/api/sites/{shortname}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml
index 4a6e2bbc0e..d87dc12a6c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml
@@ -3,6 +3,6 @@
   <description>Get the details of a site.</description>
   <url>/api/sites/{shortname}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
index d965eeba0c..e00cfc9425 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
@@ -5,6 +5,10 @@
 	"shortName" : "${site.shortName}",
 	"title" : "${site.title}",
 	"description" : "${site.description}",
+	<#if site.node?exists>
+	   "node" : "${url.serviceContext}/api/node/${site.node.storeType}/${site.node.storeId}/${site.node.id}",
+	   "tagScope" : "${url.serviceContext}/api/tagscopes/${site.node.storeType}/${site.node.storeId}/${site.node.id}",
+	</#if>
 	"isPublic" : ${site.isPublic?string("true", "false")}
 }
 </#macro>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml
index 9e8693acb9..01e12eb6f9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml
@@ -3,6 +3,6 @@
   <description>Update the details of a site.</description>
   <url>/api/sites/{shortname}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml
index 5870cd2de9..4bed4deab5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml
@@ -3,6 +3,6 @@
   <description>Get a colleciton of the sites in the repository.  The collection can be filtered by name and/or site preset.</description>
   <url>/api/sites?nf={namefilter?}&amp;spf={sitepresetfilter?}&amp;size={pagesize?}&amp;pos={position?}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml
index e91bf752a4..512c9153ab 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml
@@ -3,6 +3,6 @@
   <description>Creates a new site based on the site preset and details provided.</description>
   <url>/api/sites</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js
index 305db2814f..9ef0cfa207 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js
@@ -17,19 +17,20 @@ function findTargetNode()
       }
       else if (containerId == undefined)
       {
-         // PENDING: hack!
-         // site is not a node reference, which we need though to get the tagscope.
-         // simply take a container we know it exists and fetch the parent
-         return site.getContainer("blog").parent;
-         //return site;
+         // get site node
+         return site.node;
       }
       
       // fetch container
       node = site.getContainer(containerId);
       if (node === null)
       {
-         status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
-         return null;
+         node = site.createContainer(containerId);
+         if (node === null)
+         {
+         	status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
+         	return null;
+         }
       }
       else if (path == undefined)
       {
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml
index 7bf202bfdc..523b230ec7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml
@@ -4,6 +4,6 @@
   <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>  
   <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml
index de5c95bd5f..f6802c1009 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml
@@ -4,6 +4,6 @@
   <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}?qc={queuecreate?}&amp;ph={placeholder?}</url>  
   <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}?qc={queuecreate?}&amp;ph={placeholder?}</url>
   <format default="">argument</format>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
index d71ebc1416..d757af3072 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
@@ -13,7 +13,7 @@ function main()
    }
    
    // Get the thumbnail name from the JSON content 
-   var thumbnailName = url.templateArgs.thumbnailname; //pathSegments[pathSegments.length - 1];
+   var thumbnailName = url.templateArgs.thumbnailname; 
    
    // 404 if no thumbnail name found
    if (thumbnailName == null)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml
index c5ad92b752..369229699a 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml
@@ -4,6 +4,6 @@
   <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>  
   <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml
index f0518155b6..6ae7195077 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml
@@ -4,6 +4,6 @@
   <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails?as={async?}</url>  
   <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails?as={async?}</url>
   <format default="json"/>
-  <authentication>guest</authentication>
+  <authentication>user</authentication>
   <transaction>required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
index 6960056621..12f4b97775 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
@@ -96,6 +96,11 @@ else
    {
       // Upload mode, since uploadDirectory was used
       var container = site.getContainer(containerId);
+      if (container === null)
+      {
+         container = site.createContainer(containerId);
+      }
+      
       if (container === null)
       {
          status.code = 404;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.js
index 45f7e2755e..5a96f22ce8 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.js
@@ -23,7 +23,11 @@ function deleteEvent()
      var eventsFolder = site.getContainer("calendar");
      if (eventsFolder === null)
      {
-	  	return status.STATUS_NOT_FOUND;
+        eventsFolder = site.createContainer("calendar");
+        if (eventsFolder === null)
+        {
+	  		return status.STATUS_NOT_FOUND;
+	  	}
      }
 
      var event = eventsFolder.childByNamePath(params.eventname);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
index 4dcb453fa7..68403d2869 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
@@ -56,7 +56,11 @@ function main()
    var eventsFolder = site.getContainer("calendar");
    if (eventsFolder === null)
    {
-      return jsonError("Could not locate events container");
+      eventsFolder = site.createContainer("calendar");
+      if (eventsFolder === null)
+      {
+      	return jsonError("Could not locate events container");
+      }
    }
 
    var event = eventsFolder.childByNamePath(params.eventname);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
index 868e6da815..a471c1ae93 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
@@ -52,9 +52,13 @@ function createEvent(siteId, params)
   var calendar = site.getContainer("calendar");
   if (calendar === null)
   {
-    return {
-      "error": "Could not get container"
-    };
+    calendar = site.createContainer("calendar");
+    if (calendar === null)
+    {
+      return {
+        "error": "Could not get container"
+      };
+    }
   }
   
   if (!calendar.isTagScope)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
index d7751870d5..9a85914c67 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
@@ -43,7 +43,11 @@ function main()
    var eventsFolder = site.getContainer("calendar");
    if (eventsFolder === null)
    {
-      return status.STATUS_NOT_FOUND;
+   	  eventsFolder = site.createContainer("calendar");
+   	  if (eventsFolder === null)
+   	  {
+      	return status.STATUS_NOT_FOUND;
+      }
    }
 
 	var event = eventsFolder.childByNamePath(params.eventname);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
index e5632126cd..b6156595bb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
@@ -14,7 +14,11 @@ function getEvents(siteId)
    var calendar = site.getContainer("calendar");
    if (calendar === null)
    {
-      return [];
+      calendar = site.createContainer("calendar");
+      if (calendar === null)
+      {
+      	return [];
+      }
    }
    
    if (!calendar.isTagScope)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
index 157bd6e12c..f12a96f157 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/docsummary/docsummary.get.js
@@ -25,7 +25,11 @@ function getDocs(siteId, filter)
       var parentNode = site.getContainer("documentLibrary");
       if (parentNode === null)
       {
-         return jsonError("Document Library container not found in: " + siteId + ". (No write permission?)");
+         parentNode = site.createContainer("documentLibrary");
+         if (parentNode === null)
+         {
+         	return jsonError("Document Library container not found in: " + siteId + ". (No write permission?)");
+         }
       }
 
       // build up the query to get documents modified in the last 7 days
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
index 09b0954420..309595c72c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
@@ -285,7 +285,11 @@ function getRootNode(p_params)
       rootNode = siteNode.getContainer(p_params.containerId);
       if (rootNode === null)
       {
-   		return "Component container '" + p_params.containerId + "' not found in '" + p_params.siteId + "'.";
+        rootNode = siteNode.createContainer(p_params.containerId);
+        if (rootNode === null)
+        {
+   			return "Component container '" + p_params.containerId + "' not found in '" + p_params.siteId + "'.";
+   		}
       }
    }
    catch(e)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
index 6ed1eb876c..01ccf0bf82 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
@@ -33,8 +33,12 @@ function getParsedArgs()
       rootNode = siteNode.getContainer(container);
       if (rootNode === null)
       {
-         status.setCode(status.STATUS_NOT_FOUND, "Document Library container '" + container + "' not found in '" + site + "'. (No permission?)");
-         return null;
+      	 rootNode = siteNode.createContainer(container);
+      	 if (rootNode === null)
+      	 {
+         	status.setCode(status.STATUS_NOT_FOUND, "Document Library container '" + container + "' not found in '" + site + "'. (No permission?)");
+         	return null;
+         }
       }
    }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
index d8be7b9839..efa4581a50 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
@@ -31,8 +31,12 @@ function main()
 	var wiki = site.getContainer("wiki");
     if (wiki === null)
     {
-		return jsonError("Could not locate wiki");
-    }
+        wiki = site.createContainer("wiki");
+		if (wiki === null)
+		{
+			return jsonError("Could not locate wiki");
+		}
+	}
 
 	var page = wiki.childByNamePath(params.pageTitle);
 	if (!page)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.delete.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.delete.js
index a86c1023e5..9fc1a84bd7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.delete.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.delete.js
@@ -22,13 +22,17 @@ function deleteEvent()
       status.setCode(status.STATUS_NOT_FOUND, "Could not find site.");
 	   return;
    }
-
-   var wiki = site.getContainer("wiki");
-   if (wiki === null)
-   {
-      status.setCode(status.STATUS_NOT_FOUND, "Could not find wiki container.");
-	   return;
-   }
+   
+   	var wiki = site.getContainer("wiki");
+    if (wiki === null)
+    {
+        wiki = site.createContainer("wiki");
+		if (wiki === null)
+		{
+			status.setCode(status.STATUS_NOT_FOUND, "Could not find wiki container.");
+	   		return;
+		}
+	}
 
    var page = wiki.childByNamePath(params.pageTitle);
    if (page === null)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
index 5c29da3b5f..42c0413b9b 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
@@ -50,8 +50,12 @@ function main()
     var wiki = site.getContainer("wiki");
     if (wiki === null)
     {
-		//return jsonError("Could not locate wiki container");
-		return null;
+    	wiki = site.createContainer("wiki");
+    	if (wiki === null)
+    	{
+			//return jsonError("Could not locate wiki container");
+			return null;
+		}
     }
     
     if (!wiki.isTagScope)
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js
index 6e74889286..bed801c754 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js
@@ -47,7 +47,11 @@ function update()
     var wiki = site.getContainer("wiki");
     if (wiki === null)
     {
-		return jsonError("Could not locate wiki container");
+    	wiki = site.createContainer("wiki");
+    	if (wiki === null)
+    	{
+			return jsonError("Could not locate wiki container");
+		}
     }
 	
 	var page = wiki.childByNamePath(params.pageTitle);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
index 60d05d47a1..3284923806 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
@@ -22,8 +22,12 @@ function getWikiPages(siteId)
    var wiki = site.getContainer("wiki");
    if (wiki === null)
    {
-	   status.setCode(status.STATUS_BAD_REQUEST, "Wiki container not found");
-	   return;
+   	   wiki = site.createContainer("wiki");
+   	   if (wiki === null)
+   	   {
+	   		status.setCode(status.STATUS_BAD_REQUEST, "Wiki container not found");
+	   		return;
+	   	}
    }
    
    if (!wiki.isTagScope)
diff --git a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
index eb14ed7587..2d9a45f400 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -120,6 +120,8 @@ public class SiteServiceTest extends BaseWebScriptTest
         assertEquals(shortName, result.get("shortName"));
         assertEquals("myTitle", result.get("title"));
         assertEquals("myDescription", result.get("description"));
+        assertNotNull(result.get("node"));
+        assertNotNull(result.get("tagScope"));
         assertTrue(result.getBoolean("isPublic"));
         
         // Check for duplicate names
diff --git a/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java b/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
new file mode 100644
index 0000000000..6a42888b0e
--- /dev/null
+++ b/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.repo.web.scripts.tagging;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.util.PropertyMap;
+
+/**
+ * Unit test to test tagging Web Script API
+ * 
+ * @author Roy Wetherall
+ */
+public class TaggingServiceTest extends BaseWebScriptTest
+{    
+    private AuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private TaggingService taggingService;
+    
+    private static final String TEST_USER = "TaggingServiceTestUser";
+
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.taggingService = (TaggingService)getServer().getApplicationContext().getBean("TaggingService");
+        
+        // Create users
+        createUser(TEST_USER);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(TEST_USER);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    public void getTagsTest()
+    {
+        
+    }
+    
+}
\ No newline at end of file