diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java
index ec1139aee..7f563c90d 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java
@@ -60,7 +60,7 @@ public class ItemSearch extends Form implements Resettable, QueryGenerator {
      */
     public ItemSearch(String context, boolean limitToContentSection) {
         super("itemSearch", new SimpleContainer());
-        setMethod("GET");
+        //setMethod("GET");
         m_section = createSearchSection(context, limitToContentSection);
         add(m_section);
     }
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
index bdf2bc884..7d424f54f 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
@@ -34,7 +34,60 @@
     <xsl:template match="image-attachments">
         <xsl:if test="$data-tree/cms:contentPanel/cms:item/imageAttachments
                       or $data-tree/nav:greetingItem/cms:item/imageAttachments">
-            <xsl:apply-templates/>
+            <xsl:variable name="contentitem-tree">
+                <xsl:choose>
+                    <xsl:when test="$data-tree/nav:greetingItem">
+                        <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            
+            <xsl:variable name="multiple-class" 
+                          select="if (./@multiple-class)
+                                  then ./@multiple-class
+                                  else 'multiple'"/>
+            <xsl:variable name="single-class" 
+                          select="if (./@single-class)
+                                  then ./@single-class
+                                  else 'single'"/>
+            
+            <xsl:variable name="from" as="xs:integer">
+                <xsl:choose>
+                    <xsl:when test=".//image-attachment/@from">
+                        <xsl:value-of select="./@from"/>
+                    </xsl:when>
+                    <xsl:when test=".//image-attachment/@select">
+                        <xsl:value-of select="./@select"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="min($contentitem-tree/imageAttachments/sortKey)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+                
+            <xsl:variable name="to" as="xs:integer">
+                <xsl:choose>
+                    <xsl:when test=".//image-attachment/@to">
+                        <xsl:value-of select="./@to"/>
+                    </xsl:when>
+                    <xsl:when test=".//image-attachment/@select">
+                        <xsl:value-of select="./@select"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="max($contentitem-tree/imageAttachments/sortKey)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            
+            <xsl:apply-templates>
+                <xsl:with-param name="class"
+                                select="if (($to - $from) &gt; 0)
+                                        then $multiple-class
+                                        else $single-class"/>
+            </xsl:apply-templates>
         </xsl:if>
     </xsl:template>
     
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index ddcd25764..237924cfa 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r3418" 
+                 release="devel-SNAPSHOT-r3436" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm"