diff --git a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
index 0758065398..6441729478 100644
--- a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
+++ b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
@@ -377,7 +377,7 @@ public class RenderingEngineTemplateImpl
       final String formInstanceDataAvmPath = formInstanceData.getPath();
       final String renditionAvmPath = rendition.getPath();
       final String parentPath = AVMNodeConverter.SplitBase(formInstanceDataAvmPath)[0];
-      final String sandboxUrl = AVMUtil.buildStoreUrl(formInstanceDataAvmPath);
+      final String sandboxUrl = AVMUtil.buildStoreUrl(AVMUtil.getStoreName(formInstanceDataAvmPath));
       final String webappUrl = AVMUtil.buildWebappUrl(formInstanceDataAvmPath);
       final HashMap<QName, Object> model = new HashMap<QName, Object>();
       // add simple scalar parameters
diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
index f80dad5f85..9f0348cd4e 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java
@@ -608,7 +608,7 @@ public class XFormsBean implements Serializable
             {
                // It's a web project asset include / import
                final String baseURI = (uri.charAt(0) == '/'
-                                       ? AVMUtil.buildStoreUrl(cwdAvmPath)
+                                       ? AVMUtil.buildStoreUrl(AVMUtil.getStoreName(cwdAvmPath))
                                        : AVMUtil.buildAssetUrl(cwdAvmPath));
 
                finalURI = baseURI + uri;
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index 854d12affa..84eb59de93 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -1193,12 +1193,12 @@ alfresco.xforms.CheckboxSelect = alfresco.xforms.AbstractSelectWidget.extend({
       checkbox.setAttribute("name", this.id + "_" + i + "-widget");
       checkbox.setAttribute("type", "checkbox");
       checkbox.setAttribute("value", values[i].value);
+      checkboxDiv.appendChild(checkbox);
       if (initial_value.indexOf(values[i].value) != -1)
       {
         this._selectedValues.push(values[i].value);
         checkbox.checked = true;
       }
-      checkboxDiv.appendChild(checkbox);
       checkboxDiv.appendChild(document.createTextNode(values[i].label));
       checkbox.onclick = this._checkbox_clickHandler.bindAsEventListener(this);
     }