diff --git a/ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/ui/DecisionTreeTargetEditForm.java b/ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/ui/DecisionTreeTargetEditForm.java
index b8e558714..d8052763c 100644
--- a/ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/ui/DecisionTreeTargetEditForm.java
+++ b/ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/ui/DecisionTreeTargetEditForm.java
@@ -179,6 +179,12 @@ public class DecisionTreeTargetEditForm extends Form
         target.clearOptions();
         DecisionTree tree = (DecisionTree) m_selTree.getSelectedObject(state);
 
+        Option none = new Option(
+                "",
+                new Label(DecisionTreeGlobalizationUtil.globalize(
+                                "cms.contenttypes.ui.decisiontree.targets.form.none")));
+        target.addOption(none);
+        
         if (tree != null) {
             DecisionTreeSectionCollection sections = tree.getSections();
             if (sections != null) {
@@ -252,10 +258,10 @@ public class DecisionTreeTargetEditForm extends Form
                 "",
                 new Label(DecisionTreeGlobalizationUtil.globalize(
                                 "cms.contenttypes.ui.decisiontree.targets.form.please_select")));
-        Option none = new Option(
-                "",
-                new Label(DecisionTreeGlobalizationUtil.globalize(
-                                "cms.contenttypes.ui.decisiontree.targets.form.none")));
+//        Option none = new Option(
+//                "",
+//                new Label(DecisionTreeGlobalizationUtil.globalize(
+//                                "cms.contenttypes.ui.decisiontree.targets.form.none")));
 
     //  add(new Label(DecisionTreeGlobalizationUtil.globalize(
         //                "cms.contenttypes.ui.decisiontree.targets.form.match_value")));
@@ -289,7 +295,7 @@ public class DecisionTreeTargetEditForm extends Form
         m_targetSectionWidget = new SingleSelect(TARGET_SECTION);
         m_targetSectionWidget.setLabel(DecisionTreeGlobalizationUtil.globalize(
                 "cms.contenttypes.ui.decisiontree.targets.form.target_section_label"));
-        m_targetSectionWidget.addOption(none);
+//        m_targetSectionWidget.addOption(none);
         try {
             m_targetSectionWidget.addPrintListener(new PrintListener() {
                 @Override
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
index 9bf2fd1de..457bd8cee 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
@@ -49,7 +49,7 @@
   <xsl:import href="types/SciProject.xsl"/>
   <xsl:import href="types/SciPublications.xsl"/>
   <xsl:import href="types/Organization.xsl"/>
-  <xsl:import href="types/SiteProxy.xsl"/>
+  <!--<xsl:import href="types/SiteProxy.xsl"/>-->
   <xsl:import href="types/sci-common.xsl"/>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
index d5004cd1e..7efb439ee 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
@@ -114,9 +114,9 @@
                 <xsl:value-of select="./sections/instructions"/>
             </div>
             <script type="text/javascript"
-                    src="/templates/ccm-cms-types-decisiontree/forms.js"/>
+                    src="{$context-prefix}/templates/ccm-cms-types-decisiontree/forms.js"/>
             <form method="get"
-                  action="/templates/ccm-cms-types-decisiontree/form-handler.jsp">
+                  action="{$context-prefix}/templates/ccm-cms-types-decisiontree/form-handler.jsp">
                 <div>
                     <input name="section_oid"
                        type="hidden">