diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml
index 3435509ac5..a1fc523a37 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Get Model</shortname>
   <description>Get the model for given model name.</description>
-  <url>/api/solr/model/{modelShortQName}</url>
+  <url>/api/solr/model</url>
   <format default="json">argument</format>
   <authentication>admin</authentication>
   <transaction allow="readonly">required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl
index e153dc99cd..5ffc0c2c2c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl
@@ -4,7 +4,7 @@
    [
       <#list diffs as diff>
           {
-             "name": <@solrLib.qNameJSON qName=diff.modelName/>,
+             "name": "${diff.modelName}",
              "type" : "${diff.type}",
              "oldChecksum": <#if diff.oldChecksum??>${diff.oldChecksum?c}<#else>null</#if>,
              "newChecksum": <#if diff.newChecksum??>${diff.newChecksum?c}<#else>null</#if>
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java b/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java
index d39ee7510b..7ed3d36815 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java
@@ -58,17 +58,16 @@ public class AlfrescoModelGet extends AbstractWebScript
     private void handle(WebScriptRequest req, WebScriptResponse res) throws JSONException, IOException
     {
         // create map of template vars
-        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
-        String modelName = templateVars.get("modelShortQName");
-        if(modelName == null)
+        String modelQName = req.getParameter("modelQName");
+        if(modelQName == null)
         {
             throw new WebScriptException(
                     Status.STATUS_BAD_REQUEST,
-                    "URL parameter 'modelShortQName' not provided.");
+                    "URL parameter 'modelQName' not provided.");
         }
 
-        ModelDefinition.XMLBindingType bindingType = ModelDefinition.XMLBindingType.SOLR;
-        AlfrescoModel model = solrTrackingComponent.getModel(QName.createQName(modelName, namespaceService));
+        ModelDefinition.XMLBindingType bindingType = ModelDefinition.XMLBindingType.DEFAULT;
+        AlfrescoModel model = solrTrackingComponent.getModel(QName.createQName(modelQName));
         res.setHeader("XAlfresco-modelChecksum", String.valueOf(model.getModelDef().getChecksum(bindingType)));
         model.getModelDef().toXML(bindingType, res.getOutputStream());
     }