diff --git a/detailsBody.html b/detailsBody.html
index 5e0da29e..9bb09596 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -149,19 +149,31 @@
{% endif %}
-{% if tags.start_date %}
+{% if tags.year_of_construction or tags.start_date or tags.opening_date or tags.end_date %}
+
+{% if tags.year_of_construction %}
+ {{ keyTrans('year_of_construction') }}:
+ {{ tags.year_of_construction|osmFormatDate }}
+
+{% endif %}
+
+{% if tags.start_date %}
{{ keyTrans('start_date') }}:
{{ tags.start_date|osmFormatDate }}
-
+
{% endif %}
{% if tags.opening_date %}
-
-
{{ keyTrans('opening_date') }}:
{{ tags.opening_date|osmFormatDate }}
+{% endif %}
+
+{% if tags.end_date %}
+ {{ keyTrans('end_date') }}:
+ {{ tags.end_date|osmFormatDate }}
+{% endif %}
{% endif %}
diff --git a/popupBody.html b/popupBody.html
index 8952dec2..96c2d52b 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -155,19 +155,31 @@
{{ wikipedia[2] }}
{% endif %}
-{% if tags.start_date %}
+{% if tags.year_of_construction or tags.start_date or tags.opening_date or tags.end_date %}
+
+{% if tags.year_of_construction %}
+ {{ keyTrans('year_of_construction') }}:
+ {{ tags.year_of_construction|osmFormatDate }}
+
+{% endif %}
+
+{% if tags.start_date %}
{{ keyTrans('start_date') }}:
{{ tags.start_date|osmFormatDate }}
-
+
{% endif %}
{% if tags.opening_date %}
-
-
{{ keyTrans('opening_date') }}:
{{ tags.opening_date|osmFormatDate }}
+{% endif %}
+
+{% if tags.end_date %}
+ {{ keyTrans('end_date') }}:
+ {{ tags.end_date|osmFormatDate }}
+{% endif %}
{% endif %}