3 files changed, 5 insertions, 2 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html
index aa41ee34b..c57e0d681 100644
--- a/archaeological_finds/templates/ishtar/sheet_basefind.html
+++ b/archaeological_finds/templates/ishtar/sheet_basefind.html
@@ -45,6 +45,9 @@
         {% field_flex_full "Description" base_find.description "<pre>" "</pre>" first %}
         {% field_flex_full "Comment" base_find.comment "<pre>" "</pre>" first %}
     </div>
+    {% with item=base_find %}
+    {% include "ishtar/blocks/sheet_json.html" %}
+    {% endwith %}
     <h3>{% trans "Sheet"%}</h3>
     <div class='row'>
         {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %}
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 8d933d3fb..a1a8f41e5 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -481,7 +481,7 @@
       {% dynamic_table_document finds_docs 'documents' 'finds' item.pk '' output %}
   </div>
   {% endif %}
-  {% if item.data %}
+  {% if item.data and item.data != {} %}
   <div class="tab-pane fade" id="{{window_id}}-json"
        role="tabpanel" aria-labelledby="{{window_id}}-json-tab">
       {% include "ishtar/blocks/sheet_json.html" %}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_json.html b/ishtar_common/templates/ishtar/blocks/sheet_json.html
index df9340c6f..35b681d8e 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_json.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_json.html
@@ -1,6 +1,6 @@
 {% load i18n window_field %}
 {% for json_section, json_fields in item.json_sections %}
-<h3>{% if json_section %}{{json_section}}{% else %}{% trans "Data" %}{% endif %}</h3>
+{% if json_section %}<h3>{{json_section}}</h3>{% endif %}
 {% for label, value in json_fields %}
 {% if forloop.first %}<div class='row'>{% endif %}
     {% field_flex label value %}