diff --git a/castle/cms/indexing/configure.zcml b/castle/cms/indexing/configure.zcml
index 93f82b9f7..43d7d58ad 100644
--- a/castle/cms/indexing/configure.zcml
+++ b/castle/cms/indexing/configure.zcml
@@ -42,5 +42,6 @@
   <adapter name="last_modified_by" factory=".indexers.last_modified_by" />
   <adapter name="image_info" factory=".indexers.image_info" />
   <adapter name="has_custom_markup" factory=".indexers.has_custom_markup" />
+  <adapter name="raw_output" factory=".indexers.raw_output" />
 
 </configure>
diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index faa98ae45..1c796a871 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -3,6 +3,7 @@
 from wildcard.hps.interfaces import IReindexActive
 from OFS.interfaces import IItem
 from plone import api
+from plone.app.textfield.value import RichTextValue
 from plone.app.uuid.utils import uuidToCatalogBrain as get_brain
 from plone.app.contenttypes.interfaces import IFile, IImage
 from plone.dexterity.interfaces import IDexterityContent
@@ -13,6 +14,7 @@
 from Products.CMFCore.interfaces._content import IFolderish
 from ZODB.POSException import POSKeyError
 from zope.globalrequest import getRequest
+import six
 
 from castle.cms.behaviors.location import ILocation
 from castle.cms.interfaces import IHasDefaultImage
@@ -220,3 +222,22 @@ def self_or_child_has_title_description_and_image(obj):
 def has_custom_markup(image):
     if image.custom_markup:
         return True
+
+
+@indexer(IItem)
+def raw_output(obj):
+    text = getattr(obj, 'text', None)
+
+    if not text:
+        return u''
+
+    if hasattr(text, 'raw'):
+        try:
+            return text.raw or u''
+        except Exception:
+            return u''
+
+    try:
+        return six.text_type(text)
+    except Exception:
+        return u''
diff --git a/castle/cms/profiles/3020/catalog.xml b/castle/cms/profiles/3020/catalog.xml
new file mode 100644
index 000000000..566d0c941
--- /dev/null
+++ b/castle/cms/profiles/3020/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="Plone Catalog Tool">
+  <column value="raw_output"/>
+</object>
\ No newline at end of file
diff --git a/castle/cms/profiles/default/catalog.xml b/castle/cms/profiles/default/catalog.xml
index 0aa405de7..3b5159480 100644
--- a/castle/cms/profiles/default/catalog.xml
+++ b/castle/cms/profiles/default/catalog.xml
@@ -51,4 +51,6 @@
 
   <column value="has_custom_markup"/>
 
+  <column value="raw_output"/>
+
 </object>
diff --git a/castle/cms/profiles/default/metadata.xml b/castle/cms/profiles/default/metadata.xml
index 672289d74..97f9b71ee 100644
--- a/castle/cms/profiles/default/metadata.xml
+++ b/castle/cms/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>3019</version>
+  <version>3020</version>
   <dependencies>
     <dependency>profile-plone.app.querystring:default</dependency>
     <dependency>profile-plone.app.mosaic:default</dependency>
diff --git a/castle/cms/static/images/previews/querylisting/full-content.png b/castle/cms/static/images/previews/querylisting/full-content.png
new file mode 100644
index 000000000..280c3e340
Binary files /dev/null and b/castle/cms/static/images/previews/querylisting/full-content.png differ
diff --git a/castle/cms/tiles/configure.zcml b/castle/cms/tiles/configure.zcml
index ab0ac0973..88f7991b3 100644
--- a/castle/cms/tiles/configure.zcml
+++ b/castle/cms/tiles/configure.zcml
@@ -446,6 +446,12 @@
     for="plone.dexterity.interfaces.IDexterityContent ..interfaces.ICastleLayer"
     factory=".querylisting.BlogView"
     />
+  <adapter
+    name="querylisting.full-content"
+    provides="..interfaces.ITileView"
+    for="plone.dexterity.interfaces.IDexterityContent ..interfaces.ICastleLayer"
+    factory=".querylisting.FullContentView"
+  />
 
   <!-- gallery views -->
   <adapter
diff --git a/castle/cms/tiles/querylisting.py b/castle/cms/tiles/querylisting.py
index 9139e2d7f..f8a30613d 100644
--- a/castle/cms/tiles/querylisting.py
+++ b/castle/cms/tiles/querylisting.py
@@ -112,6 +112,15 @@ class BlogView(BaseTileView):
     tile_name = 'querylisting'
 
 
+class FullContentView(BaseTileView):
+    name = 'full-content'
+    label = 'Full Content'
+    preview = '++plone++castle/images/previews/querylisting/full-content.png'
+    order = 3
+    index = ViewPageTemplateFile('templates/querylisting/full-content.pt')
+    tile_name = 'querylisting'
+
+
 class QueryListingTile(BaseTile, DisplayTypeTileMixin):
     implements(IPersistentTile)
 
diff --git a/castle/cms/tiles/templates/querylisting/full-content.pt b/castle/cms/tiles/templates/querylisting/full-content.pt
new file mode 100644
index 000000000..51bb49da5
--- /dev/null
+++ b/castle/cms/tiles/templates/querylisting/full-content.pt
@@ -0,0 +1,74 @@
+<style>
+  .dt-default li .focuspoint.overlay-image-container img.overlay-image {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    top: unset;
+    height: 20%;
+    width: 100%;
+    min-height: 25px;
+    max-height: 50px;
+  }
+  .full-content-item {
+    border-bottom: 1px solid #eee;
+
+}
+    .full-content-item:last-child {
+    border-bottom: none;
+}
+</style>
+<ul class="dt-default"
+    tal:define="results view/tile/results;
+                utils view/tile/utils;
+                df view/tile/display_fields;"
+    style="${python: view.font_sizes.get('query_listing','')}"
+>
+  <tal:item tal:repeat="item python: results['items']">
+  <li tal:define="base_url item/getURL;
+                  url python: utils.get_object_url(item);
+                  has_image python: 'image' in df and utils.has_image(item);
+                  effective item/effective|nothing;
+                  start item/start|nothing;
+                  end item/end|nothing;"
+      class="portal-type-${python: utils.normalize(item.portal_type)} full-content-item">
+    <div class="row">
+      <div class="col-lg-2 col-md-3 col-sm-4" tal:condition="has_image">
+        <a href="${url}">
+          <div tal:replace="structure python: utils.focal_image_tag(item, 'mini', attempt_overlay=True)"></div>
+        </a>
+      </div>
+      <div class="col-lg-10 col-md-9 col-sm-8"
+           tal:attributes="class python: has_image and 'col-md-9' or 'col-md-12'">
+        <p class="pat-moment date"
+           tal:content="python: utils.format_date(effective, 'notime')"
+           tal:condition="python: 'date' in df and utils.valid_date(effective)"></p>
+        <p tal:condition="python: 'eventstartend' in df and start and end">
+            <span class="pat-moment date" tal:content="python: utils.format_date(start)"></span>
+            to
+            <span class="pat-moment date"
+                     tal:condition="python: start.date() == end.date()"
+                     tal:content="python: utils.format_date(end, 'nodate')"></span>
+            <span class="pat-moment date"
+                     tal:condition="python: start.date() <> end.date()"
+                     tal:content="python: utils.format_date(end)"></span>
+        </p>
+        <h2 class="full-content-title">
+          <a href="${url}">${item/Title}</a>
+        </h2>
+        <p class="full-content-date" 
+            tal:condition="context/effective"
+            tal:content="python: context.toLocalizedTime(context.effective())">
+            Publication date
+        </p>
+        <div class="full-content-body"
+              tal:on-error=""
+              tal:condition="item/raw_output"
+              tal:content="structure item/raw_output"
+        >
+        <p class="read-more"><a href="${url}" class="button">More →</a></p>
+      </div>
+    </div>
+    <hr>
+  </li>
+  </tal:item>
+</ul>
diff --git a/castle/cms/upgrades.zcml b/castle/cms/upgrades.zcml
index b2307a3e1..6ac2ffbed 100644
--- a/castle/cms/upgrades.zcml
+++ b/castle/cms/upgrades.zcml
@@ -312,5 +312,26 @@
     profile="castle.cms:default"
   />
 
+  <genericsetup:registerProfile
+    name="3020"
+    title="CastleCMS upgrade to 3020 profile"
+    directory="profiles/3020"
+    description=""
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+  />
+  <genericsetup:upgradeSteps
+    source="*"
+    destination="3020"
+    profile="castle.cms:default"
+  >
+    <genericsetup:upgradeStep
+      title="add metadata column raw_output"
+      handler="castle.cms.upgrades.upgrade_3020a"
+    />
+    <genericsetup:upgradeStep
+      title="index raw_output"
+      handler="castle.cms.upgrades.upgrade_3020b"
+    />
+  </genericsetup:upgradeSteps>
 
 </configure>
diff --git a/castle/cms/upgrades/__init__.py b/castle/cms/upgrades/__init__.py
index b42c7f992..d266153f6 100644
--- a/castle/cms/upgrades/__init__.py
+++ b/castle/cms/upgrades/__init__.py
@@ -7,6 +7,7 @@
 from Products.CMFPlone.resources.browser.cook import cookWhenChangingSettings
 from Products.CMFCore.utils import getToolByName
 from zope.interface import noLongerProvides
+from OFS.interfaces import IItem
 
 import plone.api as api
 
@@ -144,3 +145,11 @@ def upgrade_3011(site, logger=CASTLE_LOGGER):
 upgrade_3017 = default_upgrade_factory('3017')
 upgrade_3018 = default_upgrade_factory('3018')
 upgrade_3019 = default_upgrade_factory('3019')
+
+
+upgrade_3020a = default_upgrade_factory('3020')
+def upgrade_3020b(context):
+    catalog = getToolByName(context, 'portal_catalog')
+    for brain in catalog():
+        obj = brain.getObject()
+        catalog.catalog_object(obj, idxs=[])