diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post-publishing.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js
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.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.json.js
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.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/assign-workflow.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/cancel-checkout.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkin.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/folder.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/move-to.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/permissions.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/activity.post.json.js
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/userprofile.post.json.js
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.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.js
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.json.js
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.js
rename to config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.put.json.js
diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
index c33e863b06..873b8d61fe 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
@@ -121,18 +121,7 @@ public class CMISQueryReader implements FormatReader<String>
     public Map<String, Object> createScriptParameters(WebScriptRequest req, WebScriptResponse res)
     {
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("query", req.parseContent());
+        params.put("query", read(req));
         return params;
     }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.web.scripts.FormatReader#createTemplateParameters(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
-     */
-    public Map<String, Object> createTemplateParameters(WebScriptRequest req, WebScriptResponse res)
-    {
-        Map<String, Object> params = new HashMap<String, Object>();
-        params.put("query", req.parseContent());
-        return params;
-    }
-
 }
diff --git a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
index f2798de14d..899dbb3078 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
@@ -53,9 +53,6 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.util.TempFileProvider;
 import org.alfresco.web.scripts.AbstractWebScript;
 import org.alfresco.web.scripts.Cache;
-import org.alfresco.web.scripts.Container;
-import org.alfresco.web.scripts.Description;
-import org.alfresco.web.scripts.ScriptContent;
 import org.alfresco.web.scripts.Status;
 import org.alfresco.web.scripts.WebScriptException;
 import org.alfresco.web.scripts.WebScriptRequest;
@@ -86,10 +83,6 @@ public class StreamContent extends AbstractWebScript
     protected ContentService contentService;
     protected MimetypeService mimetypeService;    
     
-    // Script Context
-    private String basePath;
-    private ScriptContent executeScript;
-    
     /** Cached file modified date */
     private Date resouceFileModifiedDate;
 
@@ -125,20 +118,6 @@ public class StreamContent extends AbstractWebScript
         this.contentService = contentService; 
     }    
 
-    /* (non-Javadoc)
-     * @see org.alfresco.web.scripts.AbstractWebScript#init(org.alfresco.web.scripts.WebScriptRegistry)
-     */
-    @Override
-    public void init(Container container, Description description)
-    {
-        super.init(container, description);
-
-        // Test for "execute" script
-        basePath = getDescription().getId();
-        String scriptPath = basePath + ".js";
-        executeScript = container.getScriptProcessor().findScript(scriptPath);
-    }
-
     /**
      * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
      */
@@ -161,16 +140,17 @@ public class StreamContent extends AbstractWebScript
             model.put("cache", cache);
             
             // execute script if it exists
+            ScriptDetails executeScript = getExecuteScript(req.getContentType());
             if (executeScript != null)
             {
                 if (logger.isDebugEnabled())
-                    logger.debug("Executing script " + executeScript.getPathDescription());
+                    logger.debug("Executing script " + executeScript.getContent().getPathDescription());
                 
                 Map<String, Object> scriptModel = createScriptParameters(req, res, model);
                 // add return model allowing script to add items to template model
                 Map<String, Object> returnModel = new HashMap<String, Object>(8, 1.0f);
                 scriptModel.put("model", returnModel);
-                executeScript(executeScript, scriptModel);
+                executeScript(executeScript.getContent(), scriptModel);
                 mergeScriptModelIntoTemplateModel(returnModel, model);
             }
             
@@ -317,7 +297,7 @@ public class StreamContent extends AbstractWebScript
     final protected void renderFormatTemplate(String format, Map<String, Object> model, Writer writer)
     {
         format = (format == null) ? "" : format;
-        String templatePath = basePath + "." + format + ".ftl";
+        String templatePath = getDescription().getId() + "." + format + ".ftl";
 
         if (logger.isDebugEnabled())
             logger.debug("Rendering template '" + templatePath + "'");