diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.load b/ccm-sci-bundle/src/ccm-sci-bundle.load
index 774aa76f4..09667ed58 100644
--- a/ccm-sci-bundle/src/ccm-sci-bundle.load
+++ b/ccm-sci-bundle/src/ccm-sci-bundle.load
@@ -8,7 +8,7 @@
     <initializer class="com.arsdigita.cms.Initializer"/>
     <initializer class="com.arsdigita.portalworkspace.Initializer"/>
     <initializer class="com.arsdigita.subsite.Initializer"/>
-    <initializer class="com.arsdigita.london.search.Initializer"/>
+    <!--<initializer class="com.arsdigita.london.search.Initializer"/>-->
     <initializer class="com.arsdigita.london.terms.Initializer"/>
   </requires>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
index f0822af53..b603f7855 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
@@ -31,122 +31,123 @@
 <!-- Autor: Sören Bernstein -->
 
 <xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0" 
-  xmlns:nav="http://ccm.redhat.com/navigation"
-  xmlns:mandalay="http://mandalay.quasiweb.de" 
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-  exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet"
-  version="1.0">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+    xmlns:cms="http://www.arsdigita.com/cms/1.0" 
+    xmlns:nav="http://ccm.redhat.com/navigation"
+    xmlns:mandalay="http://mandalay.quasiweb.de" 
+    xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+    xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+    exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet"
+    version="1.0">
 
-  <!-- DE Importiere wichtige Funktionen -->
-  <!-- EN using toolbox -->
+    <!-- DE Importiere wichtige Funktionen -->
+    <!-- EN using toolbox -->
 
-  <xsl:template match="portal:workspace">
-    <xsl:apply-templates select="*[not(self::bebop:link)]"/>
-  </xsl:template>
+    <xsl:template match="portal:workspace">
+        <!--<xsl:apply-templates select="*[not(self::bebop:link)]"/>-->
+        <xsl:apply-templates/>
+    </xsl:template>
   
-  <xsl:template match="portal:workspaceDetails">
-    <div class="workspaceDetails">
-      <xsl:choose>
-        <xsl:when test="../@id != 'view'">
-          <a>
-            <xsl:attribute name="href">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="./primaryURL"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="title">
-              <xsl:call-template name="mandalay:getStaticText">
-                <xsl:with-param name="module" select="'portal'"/>
-                <xsl:with-param name="id" select="'workspace/view/title'"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'portal'"/>
-              <xsl:with-param name="id" select="'workspace/view/link'"/>
-            </xsl:call-template>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'portal'"/>
-            <xsl:with-param name="id" select="'workspace/view/text'"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+    <xsl:template match="portal:workspaceDetails">
+        <div class="workspaceDetails">
+            <xsl:choose>
+                <xsl:when test="../@id != 'view'">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link" select="./primaryURL"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:attribute name="title">
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'portal'"/>
+                                <xsl:with-param name="id" select="'workspace/view/title'"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'portal'"/>
+                            <xsl:with-param name="id" select="'workspace/view/link'"/>
+                        </xsl:call-template>
+                    </a>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'portal'"/>
+                        <xsl:with-param name="id" select="'workspace/view/text'"/>
+                    </xsl:call-template>
+                </xsl:otherwise>
+            </xsl:choose>
       &nbsp;
-      <xsl:choose>
-        <xsl:when test="../@id != 'edit' and @canEdit = 'true'">
-          <a>
-            <xsl:attribute name="href">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="concat(./primaryURL, 'edit.jsp')"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="title">
-              <xsl:call-template name="mandalay:getStaticText">
-                <xsl:with-param name="module" select="'portal'"/>
-                <xsl:with-param name="id" select="'workspace/edit/title'"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'portal'"/>
-              <xsl:with-param name="id" select="'workspace/edit/link'"/>
-            </xsl:call-template>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'portal'"/>
-            <xsl:with-param name="id" select="'workspace/edit/text'"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
+            <xsl:choose>
+                <xsl:when test="../@id != 'edit' and @canEdit = 'true'">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link" select="concat(./primaryURL, 'edit.jsp')"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:attribute name="title">
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'portal'"/>
+                                <xsl:with-param name="id" select="'workspace/edit/title'"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'portal'"/>
+                            <xsl:with-param name="id" select="'workspace/edit/link'"/>
+                        </xsl:call-template>
+                    </a>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'portal'"/>
+                        <xsl:with-param name="id" select="'workspace/edit/text'"/>
+                    </xsl:call-template>
+                </xsl:otherwise>
+            </xsl:choose>
       &nbsp;
-      <xsl:choose>
-        <xsl:when test="../@id != 'admin' and @canAdmin = 'true'">
-          <a>
-            <xsl:attribute name="href">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="concat(./primaryURL, 'admin/index.jsp')"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="title">
-              <xsl:call-template name="mandalay:getStaticText">
-                <xsl:with-param name="module" select="'portal'"/>
-                <xsl:with-param name="id" select="'workspace/admin/title'"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'portal'"/>
-              <xsl:with-param name="id" select="'workspace/admin/link'"/>
-            </xsl:call-template>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'portal'"/>
-            <xsl:with-param name="id" select="'workspace/admin/text'"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-  </xsl:template>
+            <xsl:choose>
+                <xsl:when test="../@id != 'admin' and @canAdmin = 'true'">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link" select="concat(./primaryURL, 'admin/index.jsp')"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:attribute name="title">
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'portal'"/>
+                                <xsl:with-param name="id" select="'workspace/admin/title'"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'portal'"/>
+                            <xsl:with-param name="id" select="'workspace/admin/link'"/>
+                        </xsl:call-template>
+                    </a>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'portal'"/>
+                        <xsl:with-param name="id" select="'workspace/admin/text'"/>
+                    </xsl:call-template>
+                </xsl:otherwise>
+            </xsl:choose>
+        </div>
+    </xsl:template>
   
-  <!-- Ist eigendlich überflüssig im XML, bietet keine zusatzliche Funktionalität -->
-  <xsl:template match="portal:homepageWorkspace">
-    <div class="workspaceColumn">
-      <xsl:call-template name="mandalay:processAttributes"/>
-      <xsl:apply-templates/>
-    </div>
-    <xsl:if test="position() != last()">
-      <div class="workspaceColumnSpacer">
+    <!-- Ist eigendlich überflüssig im XML, bietet keine zusatzliche Funktionalität -->
+    <xsl:template match="portal:homepageWorkspace">
+        <div class="workspaceColumn">
+            <xsl:call-template name="mandalay:processAttributes"/>
+            <xsl:apply-templates/>
+        </div>
+        <xsl:if test="position() != last()">
+            <div class="workspaceColumnSpacer">
         &nbsp;
-      </div>
-    </xsl:if>
-  </xsl:template>
+            </div>
+        </xsl:if>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
index b302a9b89..ecea0e6cb 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
@@ -400,7 +400,7 @@
                         <xsl:value-of select="./organizer/title" />
                     </dd>
                 </xsl:if>
-                <xsl:if test="($setPlaceOfConference = 'true') and (string-length(./PlaceOfConference) &gt; 0)">
+                <xsl:if test="($setPlaceOfConference = 'true') and (string-length(./placeOfConference) &gt; 0)">
                     <dt>
                         <xsl:call-template name="mandalay:getStaticText">
                             <xsl:with-param name="module" select="'SciPublications'" />