diff --git a/templates/views/views-view-fields--solr-search-content.html.twig b/templates/views/views-view-fields--solr-search-content.html.twig
index c202766..67ed375 100755
--- a/templates/views/views-view-fields--solr-search-content.html.twig
+++ b/templates/views/views-view-fields--solr-search-content.html.twig
@@ -1,34 +1,27 @@
 <div class="grid-item">
-  <div class="image">
-    {{ fields.did_image.content }}
-  </div>
-  <div class="metadata">
-    <span class="title">
-      {{ fields.title.content }}
-    </span>
-    {% for key, field in fields -%}
-    {%- if key != 'did_image' and key != 'title' -%}
-    {{ field.separator }}
-    {%- if field.wrapper_element -%}
-    <{{ field.wrapper_element }}{{ field.wrapper_attributes }}>
-      {%- endif %}
-      {%- if field.label and field.content|striptags|trim is not empty -%}
-      {%- if field.label_element -%}
-      <{{ field.label_element }}{{ field.label_attributes }}>{{ field.label }}{{ field.label_suffix }}</{{
-        field.label_element }}>
-      {%- else -%}
-      {{ field.label }}{{ field.label_suffix }}
-      {%- endif %}
-      {%- endif %}
-      {%- if field.element_type -%}
-      <{{ field.element_type }}{{ field.element_attributes }}>{{ field.content }}</{{ field.element_type }}>
-      {%- else -%}
-      {{ field.content }}
-      {%- endif %}
-      {%- if field.wrapper_element -%}
-    </{{ field.wrapper_element }}>
+  {% for field in fields -%}
+  {%- set rendered = field.content|render -%}
+  {%- if rendered|striptags|trim is not empty or rendered|striptags('<img>')|trim is not empty -%}
+  {{ field.separator }}
+  {%- if field.wrapper_element -%}
+  <{{ field.wrapper_element }}{{ field.wrapper_attributes }}>
+    {%- endif %}
+    {%- if field.label -%}
+    {%- if field.label_element -%}
+    <{{ field.label_element }}{{ field.label_attributes }}>{{ field.label }}{{ field.label_suffix }}</{{
+      field.label_element }}>
+    {%- else -%}
+    {{ field.label }}{{ field.label_suffix }}
+    {%- endif %}
     {%- endif %}
-    {%- endif -%}
-    {%- endfor %}
-  </div>
+    {%- if field.element_type -%}
+    <{{ field.element_type }}{{ field.element_attributes }}>{{ field.content }}</{{ field.element_type }}>
+    {%- else -%}
+    {{ field.content }}
+    {%- endif %}
+    {%- if field.wrapper_element -%}
+  </{{ field.wrapper_element }}>
+  {%- endif %}
+  {%- endif %}
+  {%- endfor %}
 </div>