diff --git a/enferno/admin/models/Bulletin.py b/enferno/admin/models/Bulletin.py
index 296fe0334..3639ad9f1 100644
--- a/enferno/admin/models/Bulletin.py
+++ b/enferno/admin/models/Bulletin.py
@@ -484,7 +484,9 @@ def to_compact(self) -> dict[str, Any]:
         sources_json = []
         if self.sources and len(self.sources):
             for source in self.sources:
-                sources_json.append({"id": source.id, "title": source.title})
+                sources_json.append(
+                    {"id": source.id, "title": source.title, "title_ar": source.title_ar}
+                )
 
         return {
             "id": self.id,
@@ -697,19 +699,37 @@ def to_dict(self, mode: Optional[str] = None) -> dict[str, Any]:
         sources_json = []
         if self.sources and len(self.sources):
             for source in self.sources:
-                sources_json.append({"id": source.id, "title": source.title})
+                sources_json.append(
+                    {"id": source.id, "title": source.title, "title_ar": source.title_ar}
+                )
 
         # labels json
         labels_json = []
         if self.labels and len(self.labels):
             for label in self.labels:
-                labels_json.append({"id": label.id, "title": label.title})
+                labels_json.append(
+                    {
+                        "id": label.id,
+                        "title": label.title,
+                        "title_ar": label.title_ar,
+                        "path": label._build_path(),
+                        "path_ar": label._build_path(translated=True),
+                    }
+                )
 
         # verified labels json
         ver_labels_json = []
         if self.ver_labels and len(self.ver_labels):
             for vlabel in self.ver_labels:
-                ver_labels_json.append({"id": vlabel.id, "title": vlabel.title})
+                ver_labels_json.append(
+                    {
+                        "id": vlabel.id,
+                        "title": vlabel.title,
+                        "title_ar": vlabel.title_ar,
+                        "path": vlabel._build_path(),
+                        "path_ar": vlabel._build_path(translated=True),
+                    }
+                )
 
         # events json
         events_json = []
@@ -806,7 +826,9 @@ def to_mode2(self) -> dict[str, Any]:
         sources_json = []
         if self.sources and len(self.sources):
             for source in self.sources:
-                sources_json.append({"id": source.id, "title": source.title})
+                sources_json.append(
+                    {"id": source.id, "title": source.title, "title_ar": source.title_ar}
+                )
 
         return {
             "class": "Bulletin",
diff --git a/enferno/admin/models/Incident.py b/enferno/admin/models/Incident.py
index aeba2732e..650cb89ca 100644
--- a/enferno/admin/models/Incident.py
+++ b/enferno/admin/models/Incident.py
@@ -488,7 +488,15 @@ def to_dict(self, mode: Optional[str] = None) -> dict[str, Any]:
         labels_json = []
         if self.labels and len(self.labels):
             for label in self.labels:
-                labels_json.append({"id": label.id, "title": label.title})
+                labels_json.append(
+                    {
+                        "id": label.id,
+                        "title": label.title,
+                        "title_ar": label.title_ar,
+                        "path": label._build_path(),
+                        "path_ar": label._build_path(translated=True),
+                    }
+                )
 
         # Locations json
         locations_json = []
@@ -577,7 +585,15 @@ def to_mode2(self) -> dict[str, Any]:
         labels_json = []
         if self.labels and len(self.labels):
             for label in self.labels:
-                labels_json.append({"id": label.id, "title": label.title})
+                labels_json.append(
+                    {
+                        "id": label.id,
+                        "title": label.title,
+                        "title_ar": label.title_ar,
+                        "path": label._build_path(),
+                        "path_ar": label._build_path(translated=True),
+                    }
+                )
 
         # Locations json
         locations_json = []
diff --git a/enferno/admin/models/Label.py b/enferno/admin/models/Label.py
index 4419c34be..f0bb310a9 100644
--- a/enferno/admin/models/Label.py
+++ b/enferno/admin/models/Label.py
@@ -41,14 +41,19 @@ class Label(db.Model, BaseMixin):
     parent_label_id = db.Column(db.Integer, db.ForeignKey("label.id"), index=True, nullable=True)
     parent = db.relationship("Label", remote_side=id, backref="sub_label")
 
-    def _build_path(self) -> str:
-        """Walk up parent chain, return 'Grandparent > Parent' (excludes self)."""
+    def _build_path(self, translated: bool = False) -> str:
+        """Walk up parent chain, return 'Grandparent > Parent' (excludes self).
+
+        With translated=True, use each ancestor's Arabic title, falling back to the
+        English title per level for ancestors that have no translation yet.
+        """
         parts = []
         current = self.parent
         seen = set()
         while current and current.id not in seen:
             seen.add(current.id)
-            parts.append(current.title)
+            title = (current.title_ar or current.title) if translated else current.title
+            parts.append(title)
             current = current.parent
         parts.reverse()
         return " > ".join(parts) if parts else ""
@@ -77,7 +82,7 @@ def _is_valid_parent(self, parent_id) -> bool:
     @staticmethod
     def build_tree(verified=None):
         """Build nested tree structure using raw SQL for performance."""
-        query = "SELECT id, title, parent_label_id, verified, for_bulletin, for_actor, for_incident, for_offline FROM label"
+        query = "SELECT id, title, parent_label_id, verified, for_bulletin, for_actor, for_incident, for_offline, title_ar, comments, comments_ar FROM label"
         conditions = []
         if verified is True:
             conditions.append("verified = true")
@@ -101,6 +106,9 @@ def build_tree(verified=None):
                 "for_actor": r[5],
                 "for_incident": r[6],
                 "for_offline": r[7],
+                "title_ar": r[8],
+                "comments": r[9],
+                "comments_ar": r[10],
                 "children": [],
             }
 
@@ -151,6 +159,8 @@ def to_dict(self, mode: str = "1") -> dict[str, Any]:
             "id": self.id,
             "title": self.title,
             "title_ar": self.title_ar if self.title_ar else None,
+            "path": self._build_path(),
+            "path_ar": self._build_path(translated=True),
             "comments": self.comments if self.comments else None,
             "comments_ar": self.comments_ar if self.comments_ar else None,
             "order": self.order,
@@ -181,7 +191,9 @@ def to_mode2(self) -> dict[str, Any]:
         return {
             "id": self.id,
             "title": self.title,
+            "title_ar": self.title_ar,
             "path": self._build_path(),
+            "path_ar": self._build_path(translated=True),
             "verified": self.verified,
             "for_bulletin": self.for_bulletin,
             "for_actor": self.for_actor,
diff --git a/enferno/admin/models/Source.py b/enferno/admin/models/Source.py
index bfab81d7e..cb210da60 100644
--- a/enferno/admin/models/Source.py
+++ b/enferno/admin/models/Source.py
@@ -61,6 +61,7 @@ def to_dict(self) -> dict[str, Any]:
         return {
             "id": self.id,
             "title": self.title,
+            "title_ar": self.title_ar,
             "etl_id": self.etl_id,
             "parent": {"id": self.parent.id, "title": self.parent.title} if self.parent else None,
             "comments": self.comments,
diff --git a/enferno/admin/templates/admin/activity.html b/enferno/admin/templates/admin/activity.html
index 57f63bfdc..12751a887 100644
--- a/enferno/admin/templates/admin/activity.html
+++ b/enferno/admin/templates/admin/activity.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 
 {% block css %}
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 {% endblock %}
 
 {% block content %}
@@ -146,74 +146,74 @@
 
 {% block js %}
 
-<script src="/static/js/tinymce-vue.min.js"></script>
-
-    <script src="/static/js/dropzone/dropzone.min.js"></script>
-    <script src="/static/js/components/VueDropzone.js"></script>
-
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/form-builder-mixin.js"></script>
-
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/EntityFlowMap.js"></script>
-    <script src="/static/js/components/MobilityMap.js"></script>
-    <script src="/static/js/utils/MobilityMapUtils.js"></script>
-    <script src="/static/js/components/GeoLocations.js"></script>
-
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/DualField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
-
-    <script src="/static/js/components/BulletinCard.js"></script>
-    <script src="/static/js/components/ActorProfiles.js"></script>
-    <script src="/static/js/components/ActorCard.js"></script>
-    <script src="/static/js/components/IncidentCard.js"></script>
-    <script src="/static/js/components/EventCard.js"></script>
-    <script src="/static/js/components/MediaCard.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/PreviewCard.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
-
-    <script src="/static/js/components/BulletinSearchBox.js"></script>
-    <script src="/static/js/components/ActorSearchBox.js"></script>
-    <script src="/static/js/components/IncidentSearchBox.js"></script>
-    <script src="/static/js/components/ActivitySearchBox.js"></script>
-
-    <script src="/static/js/components/BulletinResult.js"></script>
-    <script src="/static/js/components/ActorResult.js"></script>
-    <script src="/static/js/components/IncidentResult.js"></script>
-
-    <script src="/static/js/components/RelatedBulletinsCard.js"></script>
-    <script src="/static/js/components/RelatedActorsCard.js"></script>
-    <script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-    <script src="/static/js/components/PopDateField.js"></script>
-    <script src="/static/js/components/PopDateRangeField.js"></script>
-    <script src="/static/js/components/PopDateTimeField.js"></script>
-
-    <script src="/static/js/components/MediaGrid.js"></script>
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-
-    <script src="/static/js/components/Visualization.js"></script>
-    <script src="/static/js/force-graph.min.js"></script>
-
-    <script src="/static/js/components/MissingPersonCard.js"></script>
-    <script src="/static/js/components/MissingPersonField.js"></script>
-    <script src="/static/js/components/MixYesNoField.js"></script>
-    <script src="/static/js/components/MixSelectField.js"></script>
-    <script src="/static/js/components/MixReportersField.js"></script>
-
-    <script src="/static/js/videojs/video.min.js"></script>
+<script src="/static/js/tinymce-vue.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/dropzone/dropzone.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/VueDropzone.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoLocations.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActivitySearchBox.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateTimeField.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MissingPersonField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixYesNoField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixSelectField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixReportersField.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
 
 {% if config.GOOGLE_MAPS_API_KEY %}
     {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
 {% endif %}
-<script src="/static/js/Leaflet.GoogleMutant.js"></script>
+<script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
 
 
 
diff --git a/enferno/admin/templates/admin/actor-fields.html b/enferno/admin/templates/admin/actor-fields.html
index efa3233c3..8647cf333 100644
--- a/enferno/admin/templates/admin/actor-fields.html
+++ b/enferno/admin/templates/admin/actor-fields.html
@@ -127,13 +127,13 @@
 </v-main>
 
 {% endblock %} {% block outside %} {% endblock %} {% block js %}
-<script src="/static/js/Sortable.min.js"></script>
-<script src="/static/js/vuedraggable.umd.js"></script>
+<script src="/static/js/Sortable.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vuedraggable.umd.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/js/mixins/form-builder-mixin.js"></script>
-<script src="/static/js/components/FieldListItem.js"></script>
-<script src="/static/js/components/SelectFieldTypeDialog.js"></script>
-<script src="/static/js/components/ShowDetails.js"></script>
+<script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/FieldListItem.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/SelectFieldTypeDialog.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ShowDetails.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
   const { createApp } = Vue;
diff --git a/enferno/admin/templates/admin/actors.html b/enferno/admin/templates/admin/actors.html
index 925414c0e..8637fdeda 100644
--- a/enferno/admin/templates/admin/actors.html
+++ b/enferno/admin/templates/admin/actors.html
@@ -1,9 +1,9 @@
 {% extends 'layout.html' %}
 
 {% block css %}
-    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css"/>
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
-    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css">
+    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css?v={{ config.VERSION }}">
 {% endblock %} {% block content %}
 
     <media-redactor v-model="redaction.dialog" :media="redaction.media" @redacted="onRedactionSaved"></media-redactor>
@@ -343,89 +343,89 @@
 
 {% endblock %} {% block js %}
     <script
-            src="/static/js/tinymce/tinymce.min.js"
+            src="/static/js/tinymce/tinymce.min.js?v={{ config.VERSION }}"
             referrerpolicy="origin"
     ></script>
 
-    <script src="/static/js/tinymce-vue.min.js"></script>
-
-    <script src="/static/js/dropzone/dropzone.min.js"></script>
-    <script src="/static/js/components/VueDropzone.js"></script>
-
-    <script src="/static/js/mixins/related-search-mixin.js"></script>
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/ocr-mixin.js"></script>
-    <script src="/static/js/mixins/relations-mixin.js"></script>
-    <script src="/static/js/mixins/form-builder-mixin.js"></script>
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/DualField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
-    <script src="/static/js/components/SplitView.js"></script>
-
-    <script src="/static/js/components/BulletinCard.js"></script>
-    <script src="/static/js/components/ActorProfiles.js"></script>
-    <script src="/static/js/components/ActorCard.js"></script>
-    <script src="/static/js/components/IncidentCard.js"></script>
-
-    <script src="/static/js/components/BulletinSearchBox.js"></script>
-    <script src="/static/js/components/ActorSearchBox.js"></script>
-    <script src="/static/js/components/IncidentSearchBox.js"></script>
-
-
-
-    <script src="/static/js/components/BulletinResult.js"></script>
-    <script src="/static/js/components/ActorResult.js"></script>
-    <script src="/static/js/components/IncidentResult.js"></script>
-    <script src="/static/js/components/RelateItemsTemplate.js"></script>
-
-    <script src="/static/js/components/RelateBulletins.js"></script>
-    <script src="/static/js/components/RelateActors.js"></script>
-    <script src="/static/js/components/RelateIncidents.js"></script>
-
-    <script src="/static/js/components/RelatedBulletinsCard.js"></script>
-    <script src="/static/js/components/RelatedActorsCard.js"></script>
-    <script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-    <script src="/static/js/components/EventCard.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/EntityFlowMap.js"></script>
-    <script src="/static/js/components/PopDateField.js"></script>
-    <script src="/static/js/components/PopDateRangeField.js"></script>
-    <script src="/static/js/components/PopDateTimeField.js"></script>
-    <script src="/static/js/components/GeoLocations.js"></script>
-    <script src="/static/js/components/MediaGrid.js"></script>
-    <script src="/static/js/components/MediaCard.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/PreviewCard.js"></script>
-    <script src="/static/js/components/RelationEditorCard.js"></script>
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/IdNumberDynamicField.js"></script>
-    <script src="/static/js/components/EventsSection.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
-    <script src="/static/js/components/FieldRenderer.js"></script>
-    <script src="/static/js/components/MediaTranscriptionDialog.js"></script>
-    <script src="/static/js/components/MediaRedactor.js"></script>
-
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-    <script src="/static/js/components/SnapshotDialog.js"></script>
-    <script src="/static/js/components/Visualization.js"></script>
-    <script src="/static/js/force-graph.min.js"></script>
-
-    <script src="/static/js/components/MapVisualization.js"></script>
-    <script src="/static/js/components/MobilityMap.js"></script>
-    <script src="/static/js/utils/MobilityMapUtils.js"></script>
-
-    <script src="/static/js/components/MissingPersonCard.js"></script>
-    <script src="/static/js/components/MissingPersonField.js"></script>
-    <script src="/static/js/components/MixYesNoField.js"></script>
-    <script src="/static/js/components/MixSelectField.js"></script>
-    <script src="/static/js/components/MixReportersField.js"></script>
-    <script src="/static/js/videojs/video.min.js"></script>
-    <script src="/static/js/croppr/croppr.min.js"></script>
+    <script src="/static/js/tinymce-vue.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/dropzone/dropzone.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/VueDropzone.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/mixins/related-search-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/ocr-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/relations-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SplitView.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentSearchBox.js?v={{ config.VERSION }}"></script>
+
+
+
+    <script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateItemsTemplate.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelateBulletins.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateActors.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateIncidents.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateTimeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoLocations.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelationEditorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IdNumberDynamicField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EventsSection.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/FieldRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaTranscriptionDialog.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaRedactor.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SnapshotDialog.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/MapVisualization.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MissingPersonField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixYesNoField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixSelectField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixReportersField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/croppr/croppr.min.js?v={{ config.VERSION }}"></script>
 
     {% if config.GOOGLE_MAPS_API_KEY %}
         {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
diff --git a/enferno/admin/templates/admin/bulletin-fields.html b/enferno/admin/templates/admin/bulletin-fields.html
index f52e72316..a047aa5ec 100644
--- a/enferno/admin/templates/admin/bulletin-fields.html
+++ b/enferno/admin/templates/admin/bulletin-fields.html
@@ -133,13 +133,13 @@
 </v-main>
 
 {% endblock %} {% block outside %} {% endblock %} {% block js %}
-<script src="/static/js/Sortable.min.js"></script>
-<script src="/static/js/vuedraggable.umd.js"></script>
+<script src="/static/js/Sortable.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vuedraggable.umd.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/js/mixins/form-builder-mixin.js"></script>
-<script src="/static/js/components/FieldListItem.js"></script>
-<script src="/static/js/components/SelectFieldTypeDialog.js"></script>
-<script src="/static/js/components/ShowDetails.js"></script>
+<script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/FieldListItem.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/SelectFieldTypeDialog.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ShowDetails.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
   const { createApp } = Vue;
diff --git a/enferno/admin/templates/admin/bulletins.html b/enferno/admin/templates/admin/bulletins.html
index 9d8face4d..8cf6d4a73 100644
--- a/enferno/admin/templates/admin/bulletins.html
+++ b/enferno/admin/templates/admin/bulletins.html
@@ -1,9 +1,9 @@
 {% extends 'layout.html' %}
 
 {% block css %}
-    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css">
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
-    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css">
+    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css?v={{ config.VERSION }}">
 
 {% endblock %}
 
@@ -371,89 +371,89 @@
 
 {% block js %}
     <script
-            src="/static/js/tinymce/tinymce.min.js"
+            src="/static/js/tinymce/tinymce.min.js?v={{ config.VERSION }}"
             referrerpolicy="origin"
     ></script>
 
-    <script src="/static/js/tinymce-vue.min.js"></script>
-
-    <script src="/static/js/mixins/related-search-mixin.js"></script>
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/relations-mixin.js"></script>
-    <script src="/static/js/mixins/form-builder-mixin.js"></script>
-    <script src="/static/js/mixins/ocr-mixin.js"></script>
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/DualField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
-    <script src="/static/js/components/SplitView.js"></script>
-
-    <script src="/static/js/components/RelatedBulletinsCard.js"></script>
-    <script src="/static/js/components/RelatedActorsCard.js"></script>
-    <script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-    <script src="/static/js/components/BulletinCard.js"></script>
-    <script src="/static/js/components/ActorProfiles.js"></script>
-    <script src="/static/js/components/ActorCard.js"></script>
-    <script src="/static/js/components/IncidentCard.js"></script>
-
-    <script src="/static/js/components/BulletinSearchBox.js"></script>
-    <script src="/static/js/components/ActorSearchBox.js"></script>
-    <script src="/static/js/components/IncidentSearchBox.js"></script>
-    <script src="/static/js/components/ShortActorDialog.js"></script>
-
-
-
-    <script src="/static/js/components/BulletinResult.js"></script>
-    <script src="/static/js/components/ActorResult.js"></script>
-    <script src="/static/js/components/IncidentResult.js"></script>
-
-    <script src="/static/js/components/RelateBulletins.js"></script>
-    <script src="/static/js/components/RelateActors.js"></script>
-    <script src="/static/js/components/RelateIncidents.js"></script>
-    <script src="/static/js/components/RelateItemsTemplate.js"></script>
-
-    <script src="/static/js/components/EventCard.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/EntityFlowMap.js"></script>
-    <script src="/static/js/components/MobilityMap.js"></script>
-    <script src="/static/js/utils/MobilityMapUtils.js"></script>
-    <script src="/static/js/components/PopDateField.js"></script>
-    <script src="/static/js/components/PopDateTimeField.js"></script>
-    <script src="/static/js/components/PopDateRangeField.js"></script>
-    <script src="/static/js/components/GeoLocations.js"></script>
-    <script src="/static/js/components/MediaGrid.js"></script>
-    <script src="/static/js/components/MediaCard.js"></script>
-    <script src="/static/js/components/MediaRedactor.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/PreviewCard.js"></script>
-    <script src="/static/js/components/RelationEditorCard.js"></script>
+    <script src="/static/js/tinymce-vue.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/mixins/related-search-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/relations-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/ocr-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SplitView.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ShortActorDialog.js?v={{ config.VERSION }}"></script>
+
+
+
+    <script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelateBulletins.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateActors.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateIncidents.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateItemsTemplate.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateTimeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoLocations.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaRedactor.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelationEditorCard.js?v={{ config.VERSION }}"></script>
     
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-    <script src="/static/js/components/SnapshotDialog.js"></script>
-    <script src="/static/js/components/Visualization.js"></script>
-    <script src="/static/js/force-graph.min.js"></script>
-    <script src="/static/js/dropzone/dropzone.min.js"></script>
-    <script src="/static/js/components/VueDropzone.js"></script>
-    <script src="/static/js/components/IdNumberDynamicField.js"></script>
-    <script src="/static/js/components/EventsSection.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
-    <script src="/static/js/components/FieldRenderer.js"></script>
-    <script src="/static/js/components/MediaTranscriptionDialog.js"></script>
-
-
-    <script src="/static/js/components/MissingPersonCard.js"></script>
-    <script src="/static/js/components/MissingPersonField.js"></script>
-    <script src="/static/js/components/MixYesNoField.js"></script>
-    <script src="/static/js/components/MixSelectField.js"></script>
-    <script src="/static/js/components/MixReportersField.js"></script>
-
-    <script src="/static/js/videojs/video.min.js"></script>
-    <script src="/static/js/croppr/croppr.min.js"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SnapshotDialog.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/dropzone/dropzone.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/VueDropzone.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IdNumberDynamicField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EventsSection.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/FieldRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaTranscriptionDialog.js?v={{ config.VERSION }}"></script>
+
+
+    <script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MissingPersonField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixYesNoField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixSelectField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MixReportersField.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/croppr/croppr.min.js?v={{ config.VERSION }}"></script>
 
     {% if config.GOOGLE_MAPS_API_KEY %}
         {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
diff --git a/enferno/admin/templates/admin/component-data.html b/enferno/admin/templates/admin/component-data.html
index 9e8ef20cd..29424019b 100644
--- a/enferno/admin/templates/admin/component-data.html
+++ b/enferno/admin/templates/admin/component-data.html
@@ -273,10 +273,10 @@ <h3 class="text-subtitle-1 mb-2">{{ _('Full Location text format') }}
 <script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>
 '|safe }}
 {% endif %}
-<script src="/static/js/Leaflet.GoogleMutant.js"></script>
-<script src="/static/js/components/EditableTable.js"></script>
-<script src="/static/js/Sortable.min.js"></script>
-<script src="/static/js/vuedraggable.umd.js"></script>
+<script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EditableTable.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/Sortable.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vuedraggable.umd.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
     window.__GOOGLE_MAPS_API_KEY__ = '{{ config.GOOGLE_MAPS_API_KEY }}';
diff --git a/enferno/admin/templates/admin/incident-fields.html b/enferno/admin/templates/admin/incident-fields.html
index aa462cf4b..3743574ed 100644
--- a/enferno/admin/templates/admin/incident-fields.html
+++ b/enferno/admin/templates/admin/incident-fields.html
@@ -127,13 +127,13 @@
 </v-main>
 
 {% endblock %} {% block outside %} {% endblock %} {% block js %}
-<script src="/static/js/Sortable.min.js"></script>
-<script src="/static/js/vuedraggable.umd.js"></script>
+<script src="/static/js/Sortable.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vuedraggable.umd.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/js/mixins/form-builder-mixin.js"></script>
-<script src="/static/js/components/FieldListItem.js"></script>
-<script src="/static/js/components/SelectFieldTypeDialog.js"></script>
-<script src="/static/js/components/ShowDetails.js"></script>
+<script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/FieldListItem.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/SelectFieldTypeDialog.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ShowDetails.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
   const { createApp } = Vue;
diff --git a/enferno/admin/templates/admin/incidents.html b/enferno/admin/templates/admin/incidents.html
index c92dca1be..5a0a551cf 100644
--- a/enferno/admin/templates/admin/incidents.html
+++ b/enferno/admin/templates/admin/incidents.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 
 {% block css %}
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 {% endblock %}
 
 {% block content %}
@@ -301,76 +301,76 @@
 
 {% block js %}
     <script
-            src="/static/js/tinymce/tinymce.min.js"
+            src="/static/js/tinymce/tinymce.min.js?v={{ config.VERSION }}"
             referrerpolicy="origin"
     ></script>
 
-    <script src="/static/js/tinymce-vue.min.js"></script>
-
-    <script src="/static/js/mixins/related-search-mixin.js"></script>
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/relations-mixin.js"></script>
-    <script src="/static/js/mixins/form-builder-mixin.js"></script>
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/DualField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
-    <script src="/static/js/components/SplitView.js"></script>
-
-    <script src="/static/js/components/RelatedBulletinsCard.js"></script>
-    <script src="/static/js/components/RelatedActorsCard.js"></script>
-    <script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-    <script src="/static/js/components/BulletinCard.js"></script>
-    <script src="/static/js/components/ActorCard.js"></script>
-    <script src="/static/js/components/ActorProfiles.js"></script>
-    <script src="/static/js/components/IncidentCard.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
-
-    <script src="/static/js/components/BulletinSearchBox.js"></script>
-    <script src="/static/js/components/ActorSearchBox.js"></script>
-    <script src="/static/js/components/IncidentSearchBox.js"></script>
-
-
-
-    <script src="/static/js/components/BulletinResult.js"></script>
-    <script src="/static/js/components/ActorResult.js"></script>
-    <script src="/static/js/components/IncidentResult.js"></script>
-
-    <script src="/static/js/components/RelateBulletins.js"></script>
-    <script src="/static/js/components/RelateActors.js"></script>
-    <script src="/static/js/components/RelateIncidents.js"></script>
-    <script src="/static/js/components/RelateItemsTemplate.js"></script>
-
-    <script src="/static/js/components/EventCard.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/EntityFlowMap.js"></script>
-    <script src="/static/js/components/MobilityMap.js"></script>
-    <script src="/static/js/utils/MobilityMapUtils.js"></script>
-    <script src="/static/js/components/PopDateField.js"></script>
-    <script src="/static/js/components/PopDateTimeField.js"></script>
-    <script src="/static/js/components/PopDateRangeField.js"></script>
-
-    <script src="/static/js/components/GeoLocations.js"></script>
-    <script src="/static/js/components/MediaGrid.js"></script>
-    <script src="/static/js/components/MediaCard.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/PreviewCard.js"></script>
-    <script src="/static/js/components/RelationEditorCard.js"></script>
-    <script src="/static/js/components/EventsSection.js"></script>
-    <script src="/static/js/components/FieldRenderer.js"></script>
-
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-    <script src="/static/js/components/Visualization.js"></script>
-    <script src="/static/js/force-graph.min.js"></script>
-
-    <script src="/static/js/components/MissingPersonCard.js"></script>
-
-    <script src="/static/js/videojs/video.min.js"></script>
+    <script src="/static/js/tinymce-vue.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/mixins/related-search-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/relations-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SplitView.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentSearchBox.js?v={{ config.VERSION }}"></script>
+
+
+
+    <script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/RelateBulletins.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateActors.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateIncidents.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelateItemsTemplate.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateTimeField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/GeoLocations.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelationEditorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EventsSection.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/FieldRenderer.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
 
     {% if config.GOOGLE_MAPS_API_KEY %}
         {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
diff --git a/enferno/admin/templates/admin/labels.html b/enferno/admin/templates/admin/labels.html
index 7677ac08c..803d0cbe7 100644
--- a/enferno/admin/templates/admin/labels.html
+++ b/enferno/admin/templates/admin/labels.html
@@ -216,7 +216,7 @@
             </v-main>
 
 {% endblock %} {% block js %}
-    <script src="/static/js/components/SearchField.js"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
     <script nonce="{{ csp_nonce() }}">
 
         const {createApp} = Vue;
@@ -246,6 +246,7 @@
                 headers: [
                     {title: "{{_('ID')}}", value: "id", width: 80},
                     {title: "{{_('Title')}}", value: "title"},
+                    {title: "{{_('Title (AR)')}}", value: "title_ar"},
                     {title: "{{_('Parent')}}", value: "parent", sortable: false},
                     {title: "{{_('Available In')}}", value: "available_in"},
                     {% if current_user.roles_in(['Admin','Mod']) %}
diff --git a/enferno/admin/templates/admin/locations.html b/enferno/admin/templates/admin/locations.html
index 16f5dca4f..e6f33293f 100644
--- a/enferno/admin/templates/admin/locations.html
+++ b/enferno/admin/templates/admin/locations.html
@@ -147,24 +147,24 @@
 
 {% endblock %} {% block js %}
     <script
-           src="/static/js/tinymce/tinymce.min.js"
+           src="/static/js/tinymce/tinymce.min.js?v={{ config.VERSION }}"
             referrerpolicy="origin">
     </script>
-    <script src="/static/js/tinymce-vue.min.js"></script>
-    <script src="/static/js/components/LocationCard.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/DualField.js"></script>
-    <script src="/static/js/components/LocationSearchBox.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
+    <script src="/static/js/tinymce-vue.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/LocationCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/LocationSearchBox.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
 
     {% if config.GOOGLE_MAPS_API_KEY %}
         {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
 
     {% endif %}
-    <script src="/static/js/Leaflet.GoogleMutant.js"></script>
+    <script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
 
     <script nonce="{{ csp_nonce() }}" type="module">
         import * as jsondiffpatch from '/static/js/jsondiffpatch/jsondiffpatch.esm.min.js'
diff --git a/enferno/admin/templates/admin/media-dashboard.html b/enferno/admin/templates/admin/media-dashboard.html
index 9907323dc..49eab5da6 100644
--- a/enferno/admin/templates/admin/media-dashboard.html
+++ b/enferno/admin/templates/admin/media-dashboard.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% block css %}
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 {% endblock %}
 {% block content %}
     {% include 'admin/partials/media_transcription_dialog.html' %}
@@ -249,21 +249,21 @@
     </v-main>
 
 {% endblock %} {% block js %}
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/ocr-mixin.js"></script>
-    <script src="/static/js/videojs/video.min.js"></script>
-    <script src="/static/js/components/SplitView.js"></script>
-    <script src="/static/js/components/MediaTranscriptionDialog.js"></script>
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/MediaRedactor.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/PopDateField.js"></script>
-    <script src="/static/js/components/PopDateRangeField.js"></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/ocr-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SplitView.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaTranscriptionDialog.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaRedactor.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
     <script nonce="{{ csp_nonce() }}">
 
         const {createApp} = Vue;
diff --git a/enferno/admin/templates/admin/sources.html b/enferno/admin/templates/admin/sources.html
index 967eda329..913817101 100644
--- a/enferno/admin/templates/admin/sources.html
+++ b/enferno/admin/templates/admin/sources.html
@@ -53,7 +53,7 @@
                                                         <v-card-text>
                                                             <v-container>
                                                                 <v-row>
-                                                                    <v-col cols="12" md="4">
+                                                                    <v-col cols="12" md="6">
                                                                         <v-text-field
                                                                                 v-model="editedItem.title"
                                                                                 label="{{ _('Title') }}"
@@ -61,6 +61,14 @@
                                                                     </v-col>
 
                                                                     <v-col cols="12" md="6">
+                                                                        <v-text-field
+                                                                                v-model="editedItem.title_ar"
+                                                                                label="{{ _('Title (AR)') }}"
+                                                                        ></v-text-field>
+                                                                    </v-col>
+                                                                </v-row>
+                                                                <v-row>
+                                                                    <v-col cols="12" md="8">
 
                                                                         <search-field
                                                                                 v-model="editedItem.parent"
@@ -72,7 +80,7 @@
                                                                                 label="{{ _('Parent') }}"
                                                                         ></search-field>
                                                                     </v-col>
-                                                                    <v-col cols="12" md="2">
+                                                                    <v-col cols="12" md="4">
                                                                         <v-text-field
                                                                                 v-model="editedItem.etl_id"
                                                                                 label="{{ _('Origin ID') }}"
@@ -192,7 +200,7 @@
             </v-main>
 
 {% endblock %} {% block js %}
-    <script src="/static/js/components/SearchField.js"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
     <script nonce="{{ csp_nonce() }}">
 
 
@@ -217,6 +225,7 @@
                 headers: [
                     {title: "{{('ID')}}", value: "id"},
                     {title: "{{_('Title')}}", value: "title"},
+                    {title: "{{_('Title (AR)')}}", value: "title_ar"},
                     {title: "{{_('Origin ID')}}", value: "etl_id"},
 
                     {title: "{{_('Comments')}}", value: "comments"},
diff --git a/enferno/admin/templates/admin/system-administration.html b/enferno/admin/templates/admin/system-administration.html
index fa1b99f28..c6125575c 100644
--- a/enferno/admin/templates/admin/system-administration.html
+++ b/enferno/admin/templates/admin/system-administration.html
@@ -1135,10 +1135,10 @@ <h4 class="subtitle-2 mb-n1">{{ _('Enable Mail System') }}</h4>
 
 {% block js %}
 
-    <script src="/static/js/diff-tool.js"></script>
-    <script src="/static/js/components/GeoMap.js"></script>
-    <script src="/static/js/components/ShowDetails.js"></script>
-    <script src="/static/js/components/DiffRenderer.js"></script>
+    <script src="/static/js/diff-tool.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ShowDetails.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DiffRenderer.js?v={{ config.VERSION }}"></script>
     <script nonce="{{ csp_nonce() }}">
         window.__GOOGLE_MAPS_API_KEY__ = '{{ config.GOOGLE_MAPS_API_KEY }}';
         const {createApp} = Vue;
diff --git a/enferno/admin/templates/admin/system-logs.html b/enferno/admin/templates/admin/system-logs.html
index d377954c0..32d7d843a 100644
--- a/enferno/admin/templates/admin/system-logs.html
+++ b/enferno/admin/templates/admin/system-logs.html
@@ -92,8 +92,8 @@ <h3 class="text-h6">{{ _('Logs') }}</h3>
 
 
 {% endblock %} {% block js %}
-    <script src="/static/js/components/UniField.js"></script>
-    <script src="/static/js/components/SystemLogCard.js"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SystemLogCard.js?v={{ config.VERSION }}"></script>
 
 
 
diff --git a/enferno/admin/templates/admin/users.html b/enferno/admin/templates/admin/users.html
index 6029d656c..a115894c7 100644
--- a/enferno/admin/templates/admin/users.html
+++ b/enferno/admin/templates/admin/users.html
@@ -332,7 +332,7 @@
 
 
 {% endblock %} {% block js %}
-    <script src="/static/js/components/UserCard.js"></script>
+    <script src="/static/js/components/UserCard.js?v={{ config.VERSION }}"></script>
 
     <script nonce="{{ csp_nonce() }}">
 
diff --git a/enferno/admin/templates/nav-bar.html b/enferno/admin/templates/nav-bar.html
index 2e9119960..e7c36c8ac 100644
--- a/enferno/admin/templates/nav-bar.html
+++ b/enferno/admin/templates/nav-bar.html
@@ -5,7 +5,7 @@
 
   <v-toolbar-title class="ml-0 pl-2 flex-fill">
     <a href="/">
-      <img src="/static/img/bayanat-h-w-v2.svg" class="mt-1" height="42" cover loading="lazy" />
+      <img src="/static/img/bayanat-h-w-v2.svg?v={{ config.VERSION }}" class="mt-1" height="42" cover loading="lazy" />
     </a>
   </v-toolbar-title>
   <v-spacer></v-spacer>
diff --git a/enferno/app.py b/enferno/app.py
index fb1c87844..93699536a 100755
--- a/enferno/app.py
+++ b/enferno/app.py
@@ -159,6 +159,7 @@ def _should_set_storage(self, app, sess):
         _should_set_storage, app.session_interface
     )
     babel.init_app(app, locale_selector=get_locale, default_domain="messages", default_locale="en")
+    app.jinja_env.globals["get_locale"] = get_locale
     rds.init_app(app)
     mail.init_app(app)
 
diff --git a/enferno/data_import/templates/import-log.html b/enferno/data_import/templates/import-log.html
index 65aceaed7..6c5e9eb28 100644
--- a/enferno/data_import/templates/import-log.html
+++ b/enferno/data_import/templates/import-log.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% block css %}
-<link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+<link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 {% endblock %}
 {% block content %}
 
@@ -94,49 +94,49 @@
 
 {% block js %}
 
-<script src="/static/js/mixins/media-mixin.js"></script>
-<script src="/static/js/mixins/relations-mixin.js"></script>
-<script src="/static/js/mixins/form-builder-mixin.js"></script>
-<script src="/static/js/components/BulletinCard.js"></script>
-<script src="/static/js/components/ActorProfiles.js"></script>
-<script src="/static/js/components/ActorCard.js"></script>
-<script src="/static/js/components/ReadMore.js"></script>
-<script src="/static/js/components/IncidentCard.js"></script>
-<script src="/static/js/components/EventCard.js"></script>
-
-<script src="/static/js/components/MediaCard.js"></script>
-<script src="/static/js/components/MediaThumbnail.js"></script>
-<script src="/static/js/components/BulletinResult.js"></script>
-<script src="/static/js/components/ActorResult.js"></script>
-<script src="/static/js/components/IncidentResult.js"></script>
-<script src="/static/js/components/UniField.js"></script>
-
-<script src="/static/js/components/RelatedBulletinsCard.js"></script>
-<script src="/static/js/components/RelatedActorsCard.js"></script>
-<script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-<script src="/static/js/components/PdfViewer.js"></script>
-<script src="/static/js/components/NativePdfViewer.js"></script>
-<script src="/static/js/components/DocxViewer.js"></script>
-<script src="/static/js/components/ImageViewer.js"></script>
-<script src="/static/js/components/InlineMediaRenderer.js"></script>
-<script src="/static/js/components/GlobalMap.js"></script>
-<script src="/static/js/components/EntityFlowMap.js"></script>
-<script src="/static/js/components/MobilityMap.js"></script>
-<script src="/static/js/utils/MobilityMapUtils.js"></script>
-<script src="/static/js/components/Visualization.js"></script>
-<script src="/static/js/videojs/video.min.js"></script>
-<script src="/static/js/force-graph.min.js"></script>
-<script src="/static/js/components/PreviewCard.js"></script>
-<script src="/static/js/components/ImportLogStatus.js"></script>
-<script src="/static/js/components/ImportLogCard.js"></script>
-<script src="/static/js/components/MissingPersonCard.js"></script>
-<script src="/static/js/components/MediaGrid.js"></script>
+<script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/relations-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ImportLogStatus.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ImportLogCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
 
 {% if config.GOOGLE_MAPS_API_KEY %}
     {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
 {% endif %}
-<script src="/static/js/Leaflet.GoogleMutant.js"></script>
+<script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
 
     <script nonce="{{ csp_nonce() }}">
         window.__GOOGLE_MAPS_API_KEY__ = '{{ config.GOOGLE_MAPS_API_KEY }}';
diff --git a/enferno/data_import/templates/media-import.html b/enferno/data_import/templates/media-import.html
index e8a6d771d..938b5631f 100644
--- a/enferno/data_import/templates/media-import.html
+++ b/enferno/data_import/templates/media-import.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% block css %}
-<link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css">
-    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+<link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 
 
 {% endblock %}
@@ -341,15 +341,15 @@
     <div class="d-none" data-allowed-media-types='.{{ ",.".join(config.ETL_VID_EXT) }}'></div>
 {% endblock %}
 {% block js %}
-    <script src="/static/js/videojs/video.min.js"></script>
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
 
 
-    <script src="/static/js/dropzone/dropzone.min.js"></script>
-    <script src="/static/js/components/VueDropzone.js"></script>
+    <script src="/static/js/dropzone/dropzone.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/VueDropzone.js?v={{ config.VERSION }}"></script>
 
-    <script src="/static/js/components/SearchField.js" ></script>
-    <script src="/static/js/mixins/whisper-mixin.js" ></script>
-    <script src="/static/js/mixins/media-mixin.js" ></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}" ></script>
+    <script src="/static/js/mixins/whisper-mixin.js?v={{ config.VERSION }}" ></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}" ></script>
 
 
 
diff --git a/enferno/data_import/templates/sheets-import.html b/enferno/data_import/templates/sheets-import.html
index df89a45d9..8e1ed6cc4 100644
--- a/enferno/data_import/templates/sheets-import.html
+++ b/enferno/data_import/templates/sheets-import.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% block css %}
-    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css">
+    <link rel="stylesheet" href="/static/js/dropzone/dropzone.min.css?v={{ config.VERSION }}">
 {% endblock %}
 
 {% block content %}
@@ -78,7 +78,7 @@
 
 
                             <v-img style="margin:auto"
-                                    src="/static/img/csv-tool-bg.jpg">
+                                    src="/static/img/csv-tool-bg.jpg?v={{ config.VERSION }}">
                         </div>
                     </v-sheet>
 
@@ -824,15 +824,15 @@ <h5 class="text-caption mr-1">{{ _('Event Type') }}</h5>
 {% block js %}
 
 
-    <script src="/static/js/dropzone/dropzone.min.js"></script>
-    <script src="/static/js/components/VueDropzone.js"></script>
+    <script src="/static/js/dropzone/dropzone.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/VueDropzone.js?v={{ config.VERSION }}"></script>
 
 
 
-    <script src="/static/js/Sortable.min.js"></script>
-    <script src="/static/js/vuedraggable.umd.js"></script>
-    <script src="/static/js/components/DropField.js"></script>
-    <script src="/static/js/components/SearchField.js"></script>
+    <script src="/static/js/Sortable.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/vuedraggable.umd.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DropField.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/SearchField.js?v={{ config.VERSION }}"></script>
 
     <script nonce="{{ csp_nonce() }}">
 
diff --git a/enferno/deduplication/templates/deduplication.html b/enferno/deduplication/templates/deduplication.html
index e1f55de13..96a70a29d 100644
--- a/enferno/deduplication/templates/deduplication.html
+++ b/enferno/deduplication/templates/deduplication.html
@@ -105,64 +105,64 @@
 {% endblock %}
 
 {% block js %}
-<script src="/static/js/mixins/media-mixin.js"></script>
-<script src="/static/js/mixins/form-builder-mixin.js"></script>
-
-<script src="/static/js/components/GeoMap.js"></script>
-<script src="/static/js/components/GlobalMap.js"></script>
-<script src="/static/js/components/EntityFlowMap.js"></script>
-<script src="/static/js/components/MobilityMap.js"></script>
-<script src="/static/js/utils/MobilityMapUtils.js"></script>
-<script src="/static/js/components/GeoLocations.js"></script>
-
-<script src="/static/js/components/UniField.js"></script>
-<script src="/static/js/components/DualField.js"></script>
-
-<script src="/static/js/components/BulletinCard.js"></script>
-<script src="/static/js/components/ActorProfiles.js"></script>
-<script src="/static/js/components/ActorCard.js"></script>
-<script src="/static/js/components/ReadMore.js"></script>
-<script src="/static/js/components/IncidentCard.js"></script>
-<script src="/static/js/components/EventCard.js"></script>
-<script src="/static/js/components/MediaCard.js"></script>
-<script src="/static/js/components/MediaThumbnail.js"></script>
-<script src="/static/js/components/PreviewCard.js"></script>
-
-<script src="/static/js/components/BulletinResult.js"></script>
-<script src="/static/js/components/ActorResult.js"></script>
-<script src="/static/js/components/IncidentResult.js"></script>
-
-<script src="/static/js/components/RelatedBulletinsCard.js"></script>
-<script src="/static/js/components/RelatedActorsCard.js"></script>
-<script src="/static/js/components/RelatedIncidentsCard.js"></script>
-
-<script src="/static/js/components/PopDateField.js"></script>
-<script src="/static/js/components/PopDateRangeField.js"></script>
-<script src="/static/js/components/PopDateTimeField.js"></script>
-
-<script src="/static/js/components/MediaGrid.js"></script>
-<script src="/static/js/components/PdfViewer.js"></script>
-<script src="/static/js/components/NativePdfViewer.js"></script>
-<script src="/static/js/components/DocxViewer.js"></script>
-<script src="/static/js/components/ImageViewer.js"></script>
-<script src="/static/js/components/InlineMediaRenderer.js"></script>
-
-<script src="/static/js/components/Visualization.js"></script>
-<script src="/static/js/force-graph.min.js"></script>
-
-<script src="/static/js/components/MissingPersonCard.js"></script>
-<script src="/static/js/components/MissingPersonField.js"></script>
-<script src="/static/js/components/MixYesNoField.js"></script>
-<script src="/static/js/components/MixSelectField.js"></script>
-<script src="/static/js/components/MixReportersField.js"></script>
-
-<script src="/static/js/videojs/video.min.js"></script>
+<script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/GeoLocations.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/DualField.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/PopDateField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/PopDateRangeField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/PopDateTimeField.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/Visualization.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/force-graph.min.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MissingPersonField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MixYesNoField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MixSelectField.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/MixReportersField.js?v={{ config.VERSION }}"></script>
+
+<script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
 
 {% if config.GOOGLE_MAPS_API_KEY %}
 {{ '<script src="https://maps.googleapis.com/maps/api/js?key='|safe + config.GOOGLE_MAPS_API_KEY + '&loading=async" async defer></script>'|safe }}
 {% endif %}
 
-<script src="/static/js/Leaflet.GoogleMutant.js"></script>
+<script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
 
diff --git a/enferno/export/templates/export-dashboard.html b/enferno/export/templates/export-dashboard.html
index c9e927144..67de207f8 100644
--- a/enferno/export/templates/export-dashboard.html
+++ b/enferno/export/templates/export-dashboard.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% block css %}
-<link rel="stylesheet" href="/static/js/videojs/video-js.min.css">
+<link rel="stylesheet" href="/static/js/videojs/video-js.min.css?v={{ config.VERSION }}">
 {% endblock %}
 {% block content %}
 
@@ -101,41 +101,41 @@
 {% endblock %}
 
 {% block js %}
-    <script src="/static/js/videojs/video.min.js"></script>
-    <script src="/static/js/mixins/media-mixin.js"></script>
-    <script src="/static/js/mixins/relations-mixin.js"></script>
-    <script src="/static/js/mixins/form-builder-mixin.js"></script>
-
-    <script src="/static/js/components/ExportCard.js"></script>
-    <script src="/static/js/components/PreviewCard.js"></script>
-    <script src="/static/js/components/BulletinCard.js"></script>
-    <script src="/static/js/components/ActorProfiles.js"></script>
-    <script src="/static/js/components/ActorCard.js"></script>
-    <script src="/static/js/components/ReadMore.js"></script>
-    <script src="/static/js/components/IncidentCard.js"></script>
-    <script src="/static/js/components/InlineMediaRenderer.js"></script>
-    <script src="/static/js/components/ImageViewer.js"></script>
-    <script src="/static/js/components/PdfViewer.js"></script>
-    <script src="/static/js/components/NativePdfViewer.js"></script>
-    <script src="/static/js/components/DocxViewer.js"></script>
-
-    <script src="/static/js/components/BulletinResult.js"></script>
-    <script src="/static/js/components/ActorResult.js"></script>
-    <script src="/static/js/components/IncidentResult.js"></script>
-    <script src="/static/js/components/ExportDownload.js"></script>
-    <script src="/static/js/components/MissingPersonCard.js"></script>
-    <script src="/static/js/components/MediaCard.js"></script>
-    <script src="/static/js/components/MediaThumbnail.js"></script>
-    <script src="/static/js/components/RelatedIncidentsCard.js"></script>
-    <script src="/static/js/components/RelatedActorsCard.js"></script>
-    <script src="/static/js/components/RelatedBulletinsCard.js"></script>
-    <script src="/static/js/components/MediaGrid.js"></script>
-    <script src="/static/js/components/EventCard.js"></script>
-    <script src="/static/js/components/GlobalMap.js"></script>
-    <script src="/static/js/components/EntityFlowMap.js"></script>
-    <script src="/static/js/components/MobilityMap.js"></script>
-    <script src="/static/js/utils/MobilityMapUtils.js"></script>
-    <script src="/static/js/components/UniField.js"></script>
+    <script src="/static/js/videojs/video.min.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/media-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/relations-mixin.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/mixins/form-builder-mixin.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/ExportCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PreviewCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/BulletinCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorProfiles.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ReadMore.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/InlineMediaRenderer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ImageViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/PdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/NativePdfViewer.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/DocxViewer.js?v={{ config.VERSION }}"></script>
+
+    <script src="/static/js/components/BulletinResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ActorResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/IncidentResult.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/ExportDownload.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MissingPersonCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaThumbnail.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedIncidentsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedActorsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/RelatedBulletinsCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MediaGrid.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EventCard.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/GlobalMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/EntityFlowMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/MobilityMap.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/utils/MobilityMapUtils.js?v={{ config.VERSION }}"></script>
+    <script src="/static/js/components/UniField.js?v={{ config.VERSION }}"></script>
     <script nonce="{{ csp_nonce() }}">
 
         const {createApp} = Vue;
diff --git a/enferno/static/js/common/config.js b/enferno/static/js/common/config.js
index c8428dfc8..0522469fd 100644
--- a/enferno/static/js/common/config.js
+++ b/enferno/static/js/common/config.js
@@ -531,6 +531,16 @@ function translate_status(str) {
 // relationship information helper
 
 // Same-type relations (A2A/B2B/I2I) are stored once in id order (lower_id -> higher_id).
+// Lookup items render in the user's interface language when a translation exists,
+// falling back to the base (English) title. Lookups name the translated field
+// either <field>_ar or <field>_tr depending on the model.
+const localizedLookupTitle = (item, field = 'title') => {
+  if (!item) return '';
+  const translated = item[field + '_ar'] || item[field + '_tr'];
+  if (window.__lang__ === 'ar' && translated) return translated;
+  return item[field] || translated || '';
+};
+
 // From the higher-id entity's side, show each type's reverse_title so the relationship
 // reads correctly from both profiles. Falls back to title when a type has no reverse
 // (symmetric types, and all current B2B/I2I types). Cross-type relations never mirror.
@@ -539,7 +549,11 @@ const relationTypeLabels = ({ relationInfo, item, viewedEntity, relatedEntity, s
   const selectedIds = [].concat(item.related_as || []);
   return (relationInfo || [])
     .filter((relationType) => selectedIds.includes(relationType.id))
-    .map((relationType) => (flip && relationType.reverse_title ? relationType.reverse_title : relationType.title));
+    .map((relationType) =>
+      flip && relationType.reverse_title
+        ? localizedLookupTitle(relationType, 'reverse_title')
+        : localizedLookupTitle(relationType, 'title'),
+    );
 };
 
 // Reciprocal relation type: the catalog row whose title/reverse_title are swapped.
diff --git a/enferno/static/js/components/ActorProfiles.js b/enferno/static/js/components/ActorProfiles.js
index 959403c4f..6fd957e36 100644
--- a/enferno/static/js/components/ActorProfiles.js
+++ b/enferno/static/js/components/ActorProfiles.js
@@ -19,6 +19,9 @@ const ActorProfiles = Vue.defineComponent({
   },
 
   methods: {
+    localizedTitle(item) {
+      return localizedLookupTitle(item);
+    },
     fetchProfiles() {
       axios
         .get(`/admin/api/actor/${this.actorId}/profiles`)
@@ -65,7 +68,7 @@ const ActorProfiles = Vue.defineComponent({
                   <div class="px-1 title black--text">{{ translations.sources_ }}</div>
                   <div class="flex-chips">
                     <v-chip size="small" class="flex-chip" label v-for="source in profile.sources" :key="source.id">
-                      {{ source.title }}
+                      <bdi>{{ localizedTitle(source) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
@@ -76,7 +79,7 @@ const ActorProfiles = Vue.defineComponent({
                   <div class="px-1 title black--text">{{ translations.labels_ }}</div>
                   <div class="flex-chips">
                     <v-chip size="small" class="flex-chip" label v-for="label in profile.labels" :key="label.id">
-                      {{ label.title }}
+                      <bdi>{{ localizedTitle(label) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
@@ -89,7 +92,7 @@ const ActorProfiles = Vue.defineComponent({
                   <div class="flex-chips">
                     <v-chip size="small" class="flex-chip" label v-for="verLabel in profile.ver_labels"
                             :key="verLabel.id">
-                      {{ verLabel.title }}
+                      <bdi>{{ localizedTitle(verLabel) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
diff --git a/enferno/static/js/components/BulletinCard.js b/enferno/static/js/components/BulletinCard.js
index 5ae32f9ac..5f71707a4 100644
--- a/enferno/static/js/components/BulletinCard.js
+++ b/enferno/static/js/components/BulletinCard.js
@@ -34,6 +34,9 @@ const BulletinCard = Vue.defineComponent({
   },
 
   methods: {
+    localizedTitle(item) {
+      return localizedLookupTitle(item);
+    },
     translate_status(status) {
       return translate_status(status);
     },
@@ -317,7 +320,7 @@ const BulletinCard = Vue.defineComponent({
                 <v-card-text class="pt-0">
                   <div class="flex-chips">
                     <v-chip size="small" class="flex-chip" v-for="source in bulletin.sources" :key="source.id">
-                      {{ source.title }}
+                      <bdi>{{ localizedTitle(source) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
@@ -343,7 +346,7 @@ const BulletinCard = Vue.defineComponent({
                 <v-card-text class="pt-0">
                   <div class="flex-chips">
                     <v-chip label size="small" class="flex-chip" v-for="label in bulletin.labels" :key="label.id">
-                      {{ label.title }}
+                      <bdi>{{ localizedTitle(label) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
@@ -358,7 +361,7 @@ const BulletinCard = Vue.defineComponent({
                 <v-card-text class="pt-0">
                   <div class="flex-chips">
                     <v-chip label size="small" class="flex-chip" v-for="vlabel in bulletin.verLabels" :key="vlabel.id">
-                      {{ vlabel.title }}
+                      <bdi>{{ localizedTitle(vlabel) }}</bdi>
                     </v-chip>
                   </div>
                 </v-card-text>
diff --git a/enferno/static/js/components/IncidentCard.js b/enferno/static/js/components/IncidentCard.js
index f74c69e94..808086e26 100644
--- a/enferno/static/js/components/IncidentCard.js
+++ b/enferno/static/js/components/IncidentCard.js
@@ -5,6 +5,9 @@ const IncidentCard = Vue.defineComponent({
     this.$root.fetchDynamicFields({ entityType: 'incident' })
   },
   methods: {
+    localizedTitle(item) {
+      return localizedLookupTitle(item);
+    },
     async loadGeoMap() {
       this.geoMapLoading = true;
       this.geoMapOn = true;
@@ -217,7 +220,7 @@ const IncidentCard = Vue.defineComponent({
                 <v-card-text>
                   <div class="px-1 title black--text">{{ translations.labels_ }}</div>
                   <div class="flex-chips">
-                    <v-chip class="flex-chip" v-for="label in incident.labels" :key="label.id">{{ label.title }}</v-chip>
+                    <v-chip class="flex-chip" v-for="label in incident.labels" :key="label.id"><bdi>{{ localizedTitle(label) }}</bdi></v-chip>
                   </div>
                 </v-card-text>
               </v-card>
diff --git a/enferno/static/js/components/IncidentSearchBox.js b/enferno/static/js/components/IncidentSearchBox.js
index 348c81124..8086c38db 100644
--- a/enferno/static/js/components/IncidentSearchBox.js
+++ b/enferno/static/js/components/IncidentSearchBox.js
@@ -150,6 +150,9 @@ const IncidentSearchBox = Vue.defineComponent({
   },
 
   methods: {
+    localizedTitle(item) {
+      return localizedLookupTitle(item);
+    },
     setActivePanels() {
       if (!this.expandActivePanels) {
         return;
@@ -394,7 +397,7 @@ const IncidentSearchBox = Vue.defineComponent({
                       size="small"
                       filter
                       variant="outlined"
-                  >{{ category.title }}</v-chip>
+                  ><bdi>{{ localizedTitle(category) }}</bdi></v-chip>
                 </v-chip-group>
               </template>
 
@@ -411,7 +414,7 @@ const IncidentSearchBox = Vue.defineComponent({
                       size="small"
                       filter
                       variant="outlined"
-                  >{{ category.title }}</v-chip>
+                  ><bdi>{{ localizedTitle(category) }}</bdi></v-chip>
                 </v-chip-group>
               </template>
 
diff --git a/enferno/static/js/components/RelatedActorsCard.js b/enferno/static/js/components/RelatedActorsCard.js
index 20438a521..3dac237d6 100644
--- a/enferno/static/js/components/RelatedActorsCard.js
+++ b/enferno/static/js/components/RelatedActorsCard.js
@@ -83,7 +83,7 @@ const RelatedActorsCard = Vue.defineComponent({
                   <v-chip v-if="item.probability !== null" size="small" label class="flex-chip">{{ probability(item) }}</v-chip>
                   <div class="text-caption font-weight-bold mt-2">Related as</div>
                   <div class="flex-chips">
-                    <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label>{{ r }}</v-chip>
+                    <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label><bdi>{{ r }}</bdi></v-chip>
                   </div>
                   <div class="text-caption font-weight-bold mt-2">Comments</div>
                   <div v-if="item.comment" class="text-caption"><read-more>{{ item.comment }}</read-more></div>
diff --git a/enferno/static/js/components/RelatedBulletinsCard.js b/enferno/static/js/components/RelatedBulletinsCard.js
index 234ce6653..7a30adc41 100644
--- a/enferno/static/js/components/RelatedBulletinsCard.js
+++ b/enferno/static/js/components/RelatedBulletinsCard.js
@@ -83,7 +83,7 @@ const RelatedBulletinsCard = Vue.defineComponent({
                   <v-chip v-if="item.probability !== null" size="small" label class="flex-chip">{{ probability(item) }}</v-chip>
                   <div class="text-caption font-weight-bold mt-2">Related as</div>
                   <div class="flex-chips">
-                    <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label>{{ r }}</v-chip>
+                    <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label><bdi>{{ r }}</bdi></v-chip>
                   </div>
                   <div class="text-caption font-weight-bold mt-2">Comments</div>
                   <div v-if="item.comment" class="text-caption"><read-more>{{ item.comment }}</read-more></div>
diff --git a/enferno/static/js/components/RelatedIncidentsCard.js b/enferno/static/js/components/RelatedIncidentsCard.js
index 81c35fd04..e3257bc0e 100644
--- a/enferno/static/js/components/RelatedIncidentsCard.js
+++ b/enferno/static/js/components/RelatedIncidentsCard.js
@@ -84,7 +84,7 @@ const RelatedIncidentsCard = Vue.defineComponent({
                 <v-chip v-if="item.probability !== null" size="small" label class="flex-chip">{{ probability(item) }}</v-chip>
                 <div class="text-caption font-weight-bold mt-2">Related as</div>
                 <div class="flex-chips">
-                  <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label>{{ r }}</v-chip>
+                  <v-chip v-if="item?.related_as" v-for="r in relatedAsLabels(item)" class="flex-chip" size="small" label><bdi>{{ r }}</bdi></v-chip>
                 </div>
                 <div class="text-caption font-weight-bold mt-2">Comments</div>
                 <div v-if="item.comment" class="text-caption"><read-more>{{ item.comment }}</read-more></div>
diff --git a/enferno/static/js/components/RelationEditorCard.js b/enferno/static/js/components/RelationEditorCard.js
index f52337153..139ea7042 100644
--- a/enferno/static/js/components/RelationEditorCard.js
+++ b/enferno/static/js/components/RelationEditorCard.js
@@ -28,6 +28,11 @@ const RelationEditorCard = Vue.defineComponent({
       translations: window.translations,
     };
   },
+  methods: {
+    localizedTitle(item) {
+      return localizedLookupTitle(item);
+    },
+  },
   template: `
     <v-card>
       <v-card-item>
@@ -60,7 +65,7 @@ const RelationEditorCard = Vue.defineComponent({
             >
               <v-chip v-for="rel in relationTypes"
                       :value="rel.id"
-                      :key="rel.id" size="small"> {{ rel.title }}
+                      :key="rel.id" size="small"><bdi>{{ localizedTitle(rel) }}</bdi>
               </v-chip>
             </v-chip-group>
           </v-list-item-subtitle>
diff --git a/enferno/static/js/components/SearchField.js b/enferno/static/js/components/SearchField.js
index ae52633a0..4bc54c32b 100644
--- a/enferno/static/js/components/SearchField.js
+++ b/enferno/static/js/components/SearchField.js
@@ -34,6 +34,14 @@ const SearchField = Vue.defineComponent({
       type: String,
       default: null,
     },
+    // Field holding the translated title (e.g. 'title_ar' or 'title_tr').
+    // When null, a '<itemTitle>_ar' / '<itemTitle>_tr' key on the fetched items
+    // is picked up automatically. The user's interface language decides which
+    // language renders as the primary text and which as the secondary one.
+    itemTranslation: {
+      type: String,
+      default: null,
+    },
     retainSearch: {
       type: Boolean,
       default: false,
@@ -52,9 +60,53 @@ const SearchField = Vue.defineComponent({
         return this.filterItems(this.items);
       }
       return this.items;
-    }
+    },
+    isArabic() {
+      return window.__lang__ === 'ar';
+    },
   },
   methods: {
+    translationField(raw) {
+      if (this.itemTranslation) return this.itemTranslation;
+      if (raw == null || typeof raw !== 'object') return null;
+      for (const suffix of ['_ar', '_tr']) {
+        const key = this.itemTitle + suffix;
+        if (key in raw) return key;
+      }
+      return null;
+    },
+    primaryTitle(raw) {
+      if (raw == null || typeof raw !== 'object') return raw ?? '';
+      const field = this.translationField(raw);
+      const translated = field ? raw[field] : null;
+      if (this.isArabic && translated) return translated;
+      return raw[this.itemTitle] || translated || '';
+    },
+    secondaryTitle(raw) {
+      if (raw == null || typeof raw !== 'object') return null;
+      const field = this.translationField(raw);
+      const translated = field ? raw[field] : null;
+      if (!translated || !raw[this.itemTitle]) return null;
+      return this.isArabic ? raw[this.itemTitle] : translated;
+    },
+    localizedItemTitle(item) {
+      if (item == null || typeof item !== 'object') return item;
+      return this.primaryTitle(item);
+    },
+    subtitleText(raw) {
+      if (!this.itemSubtitle) return null;
+      let text = raw[this.itemSubtitle];
+      if (this.isArabic && raw[this.itemSubtitle + '_ar']) {
+        text = raw[this.itemSubtitle + '_ar'];
+      }
+      return this.collapsePath(text);
+    },
+    collapsePath(text) {
+      if (!text) return text;
+      const parts = String(text).split(' > ');
+      if (parts.length <= 3) return text;
+      return [parts[0], '…', parts[parts.length - 1]].join(' > ');
+    },
     startSearch(search) {
       this.loading = true;
       this.debouncedSearch(search);
@@ -148,7 +200,7 @@ const SearchField = Vue.defineComponent({
       item-color="secondary"
       :label="label"
       :items="filteredItems"
-      :item-title="itemTitle"
+      :item-title="localizedItemTitle"
       :item-value="itemValue"
       prepend-inner-icon="mdi-magnify"
       :multiple="multiple"
@@ -161,16 +213,26 @@ const SearchField = Vue.defineComponent({
       :loading="loading"
       :rules="rules"
     >
-      <template v-if="itemSubtitle" v-slot:item="{ item, props }">
+      <template v-slot:chip="{ item, props }">
+        <v-chip v-bind="props" label style="height: auto;">
+          <span class="d-flex flex-column py-1">
+            <bdi class="text-body-2">{{ primaryTitle(item.raw) }}</bdi>
+            <bdi v-if="secondaryTitle(item.raw)" class="text-caption text-medium-emphasis">{{ secondaryTitle(item.raw) }}</bdi>
+          </span>
+        </v-chip>
+      </template>
+      <template v-slot:item="{ item, props }">
         <v-list-item v-bind="props" density="compact">
           <template v-if="multiple" v-slot:prepend="{ isActive }">
             <v-checkbox-btn :model-value="isActive" density="compact" tabindex="-1" style="pointer-events: none;"></v-checkbox-btn>
           </template>
           <template v-slot:title>
-            <span class="text-body-2">{{ item.raw[itemTitle] }}</span>
+            <span class="text-body-2">
+              <bdi>{{ primaryTitle(item.raw) }}</bdi><template v-if="secondaryTitle(item.raw)"> · <bdi class="text-caption text-grey">{{ secondaryTitle(item.raw) }}</bdi></template>
+            </span>
           </template>
-          <template v-if="item.raw[itemSubtitle]" v-slot:subtitle>
-            <span class="text-caption text-grey">{{ item.raw[itemSubtitle] }}</span>
+          <template v-if="subtitleText(item.raw)" v-slot:subtitle>
+            <span class="text-caption text-grey"><bdi>{{ subtitleText(item.raw) }}</bdi></span>
           </template>
         </v-list-item>
       </template>
diff --git a/enferno/templates/account-security.html b/enferno/templates/account-security.html
index 4b7bd2576..00a35b373 100644
--- a/enferno/templates/account-security.html
+++ b/enferno/templates/account-security.html
@@ -408,7 +408,7 @@ <h1 class="text-h6 mb-5">{{ _('Account Security') }}</h1>
     </div>
 </v-main>
 {% endblock %} {% block js %}
-<script src="/static/js/qrcodejs/qrcode.min.js"></script>
+<script src="/static/js/qrcodejs/qrcode.min.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
     const { createApp } = Vue;
diff --git a/enferno/templates/layout.html b/enferno/templates/layout.html
index da758bdb4..cae303ec5 100644
--- a/enferno/templates/layout.html
+++ b/enferno/templates/layout.html
@@ -7,40 +7,40 @@
     <meta name="author" content="{{ _('Syria Justice and Accountability Center') }}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
 
-    <link rel="stylesheet" href="/static/css/vuetify.min.css"/>
+    <link rel="stylesheet" href="/static/css/vuetify.min.css?v={{ config.VERSION }}"/>
 
-    <link rel="stylesheet" href="/static/js/jsondiffpatch/formatters/styles/html.css">
-    <link rel="stylesheet" href="/static/css/app.css?v=290"/>
-    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css"/>
-    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css"/>
-    <link rel="stylesheet" href="/static/css/leaflet.css">
-    <link rel="stylesheet" href="/static/css/MarkerCluster.css">
-    <link rel="stylesheet" href="/static/css/MarkerCluster.Default.css">
-    <link rel="stylesheet" href="/static/css/Leaflet.PolylineMeasure.css">
-    <link rel="stylesheet" href="/static/leaflet-fullscreen/leaflet.fullscreen.css">
+    <link rel="stylesheet" href="/static/js/jsondiffpatch/formatters/styles/html.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/css/app.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/css/leaflet.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/css/MarkerCluster.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/css/MarkerCluster.Default.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/css/Leaflet.PolylineMeasure.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/leaflet-fullscreen/leaflet.fullscreen.css?v={{ config.VERSION }}">
 
-    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-rotate.css"/>
-    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-zoom.css"/>
-    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-thumbnail.css"/>
-    <link rel="stylesheet" href="/static/js/lightgallery/css/lightgallery.css"/>
+    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-rotate.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-zoom.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/lightgallery/css/lg-thumbnail.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/lightgallery/css/lightgallery.css?v={{ config.VERSION }}"/>
 
 
     <!-- favicon -->
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png">
-    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json">
+    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png?v={{ config.VERSION }}">
+    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json?v={{ config.VERSION }}">
     <meta name="msapplication-TileImage" content="/static/img/favicon/ms-icon-144x144.png">
 
     {% block head_js %} {% endblock %}
@@ -89,7 +89,7 @@
   data-is-admin="{{ current_user.has_role('Admin')|tojson if current_user.is_authenticated else 'false' }}"
   data-is-da="{{ current_user.has_role('DA')|tojson if current_user.is_authenticated else 'false' }}"
   data-settings='{{ current_user.settings|tojson if current_user.is_authenticated and current_user.settings else '{}' }}'
-  data-lang="{{ session.get('lang', 'en') }}"
+  data-lang="{{ get_locale() }}"
   data-maps-api-endpoint="{{ config.MAPS_API_ENDPOINT }}"
   data-ocr-provider="{{ config.OCR_PROVIDER }}"
   data-app-version="{{ config.VERSION }}"
@@ -110,39 +110,39 @@
 
 
 {% if config.DEBUG %}
-<script src="/static/js/vue.global.js"></script>
+<script src="/static/js/vue.global.js?v={{ config.VERSION }}"></script>
 {% else  %}
-<script src="/static/js/vue.global.prod.js"></script>
+<script src="/static/js/vue.global.prod.js?v={{ config.VERSION }}"></script>
 {% endif  %}
-<script src="/static/js/vuetify.min.js"></script>
-<script src="/static/js/vue-router.global.js"></script>
-<script src="/static/js/axios.min.js"></script>
-<script src="/static/js/dayjs-with-plugins.min.js"></script>
-<script src="/static/js/lightgallery/plugins/rotate/lg-rotate.min.js"></script>
-<script src="/static/js/lightgallery/plugins/zoom/lg-zoom.min.js"></script>
-<script src="/static/js/lightgallery/plugins/thumbnail/lg-thumbnail.min.js"></script>
-<script src="/static/js/lightgallery/lightgallery.min.js"></script>
-<script src="/static/js/leaflet.js"></script>
-<script src="/static/leaflet-fullscreen/leaflet.fullscreen.min.js"></script>
-<script src="/static/js/leaflet.markercluster.js"></script>
-<script src="/static/js/leaflet.curve.min.js"></script>
-<script src="/static/js/leaflet.rotatedmarker.min.js"></script>
-<script src="/static/js/Leaflet.PolylineMeasure.js"></script>
-<script src="/static/js/Leaflet.GoogleMutant.js"></script>
-<script src="/static/js/date_fns.min.js"></script>
+<script src="/static/js/vuetify.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vue-router.global.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/axios.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/dayjs-with-plugins.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/lightgallery/plugins/rotate/lg-rotate.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/lightgallery/plugins/zoom/lg-zoom.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/lightgallery/plugins/thumbnail/lg-thumbnail.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/lightgallery/lightgallery.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/leaflet.js?v={{ config.VERSION }}"></script>
+<script src="/static/leaflet-fullscreen/leaflet.fullscreen.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/leaflet.markercluster.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/leaflet.curve.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/leaflet.rotatedmarker.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/Leaflet.PolylineMeasure.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/Leaflet.GoogleMutant.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/date_fns.min.js?v={{ config.VERSION }}"></script>
 
 <script nonce="{{ csp_nonce() }}">
     {%  include 'admin/jsapi.jinja2' %}
 </script>
-<script src="/static/js/components/ProfileDropdown.js"></script>
-<script src="/static/js/components/UpdateBanner.js"></script>
-<script src="/static/js/components/NotificationsList.js"></script>
-<script src="/static/js/components/ConfirmDialog.js"></script>
-<script src="/static/js/components/Toast.js"></script>
-<script src="/static/js/common/config.js"></script>
-<script src="/static/js/mixins/reauth-mixin.js"></script>
-<script src="/static/js/mixins/notification-mixin.js"></script>
-<script src="/static/js/mixins/global-mixin.js"></script>
+<script src="/static/js/components/ProfileDropdown.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/UpdateBanner.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/NotificationsList.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/ConfirmDialog.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/Toast.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/common/config.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/reauth-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/notification-mixin.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/mixins/global-mixin.js?v={{ config.VERSION }}"></script>
 
 {% block js %}{% endblock %}
 
diff --git a/enferno/templates/login-layout.html b/enferno/templates/login-layout.html
index c0ca6f7df..05486369b 100644
--- a/enferno/templates/login-layout.html
+++ b/enferno/templates/login-layout.html
@@ -8,27 +8,27 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
 
 
-    <link rel="stylesheet" href="/static/css/vuetify.min.css"/>
-    <link rel="stylesheet" href="/static/css/app.css"/>
-    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css"/>
-    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css"/>
+    <link rel="stylesheet" href="/static/css/vuetify.min.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/css/app.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/js/croppr/croppr.min.css?v={{ config.VERSION }}"/>
 
     <!-- favicon -->
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png">
-    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json">
+    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png?v={{ config.VERSION }}">
+    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json?v={{ config.VERSION }}">
     <meta name="msapplication-TileImage" content="/static/img/favicon/ms-icon-144x144.png">
 
     {% block css %}{% endblock %}
@@ -56,19 +56,19 @@
 </script>
 
 {% if config.DEBUG %}
-<script src="/static/js/vue.global.js"></script>
+<script src="/static/js/vue.global.js?v={{ config.VERSION }}"></script>
 {% else  %}
-<script src="/static/js/vue.global.prod.js"></script>
+<script src="/static/js/vue.global.prod.js?v={{ config.VERSION }}"></script>
 {% endif  %}
 
-<script src="/static/js/vuetify.min.js"></script>
-<script src="/static/js/axios.min.js"></script>
+<script src="/static/js/vuetify.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/axios.min.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/js/vue-router.global.js"></script>
+<script src="/static/js/vue-router.global.js?v={{ config.VERSION }}"></script>
 <script nonce="{{ csp_nonce() }}">
     {%  include 'admin/jsapi.jinja2' %}
 </script>
-<script src="/static/js/common/config.js"></script>
+<script src="/static/js/common/config.js?v={{ config.VERSION }}"></script>
 
 
 
diff --git a/enferno/templates/security/login_user.html b/enferno/templates/security/login_user.html
index af14dd6f5..2a15c0041 100755
--- a/enferno/templates/security/login_user.html
+++ b/enferno/templates/security/login_user.html
@@ -66,7 +66,7 @@
       <a href="/auth"
         ><img
           width="191"
-          src="/static/img/google-login/2x/btn_google_signin_light_normal_web@2x.png"
+          src="/static/img/google-login/2x/btn_google_signin_light_normal_web@2x.png?v={{ config.VERSION }}"
           alt=""
           loading="lazy"
       /></a>
diff --git a/enferno/templates/setup_wizard.html b/enferno/templates/setup_wizard.html
index c0cbddbd9..a1aea5287 100644
--- a/enferno/templates/setup_wizard.html
+++ b/enferno/templates/setup_wizard.html
@@ -6,28 +6,28 @@
     <meta name="description" content=""/>
     <meta name="author" content="{{ _('Syria Justice and Accountability Center') }}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <link rel="stylesheet" href="/static/css/vuetify.min.css"/>
-    <link rel="stylesheet" href="/static/css/app.css"/>
-    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css"/>
-    <link rel="stylesheet" href="/static/css/leaflet.css">
-    <link rel="stylesheet" href="/static/leaflet-fullscreen/leaflet.fullscreen.css">
+    <link rel="stylesheet" href="/static/css/vuetify.min.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/css/app.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/font/mdi/css/materialdesignicons.css?v={{ config.VERSION }}"/>
+    <link rel="stylesheet" href="/static/css/leaflet.css?v={{ config.VERSION }}">
+    <link rel="stylesheet" href="/static/leaflet-fullscreen/leaflet.fullscreen.css?v={{ config.VERSION }}">
 
     <!-- favicon -->
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png">
-    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json">
+    <link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png?v={{ config.VERSION }}">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png?v={{ config.VERSION }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png?v={{ config.VERSION }}">
+    <link rel="manifest" crossorigin="use-credentials" href="/static/img/favicon/manifest.json?v={{ config.VERSION }}">
     <meta name="msapplication-TileImage" content="/static/img/favicon/ms-icon-144x144.png">
 
 
@@ -415,9 +415,9 @@ <h2 class="mt-1 subtitle-2 mb-2">{{ _('Two Factor Authentication Policies') }}</
 <div class="d-none" data-maps-api-endpoint='{{ config.MAPS_API_ENDPOINT }}'></div>
 
 {% if config.DEBUG %}
-    <script src="/static/js/vue.global.js"></script>
+    <script src="/static/js/vue.global.js?v={{ config.VERSION }}"></script>
 {% else %}
-    <script src="/static/js/vue.global.prod.js"></script>
+    <script src="/static/js/vue.global.prod.js?v={{ config.VERSION }}"></script>
 {% endif %}
 <script nonce="{{ csp_nonce() }}">
     window.__settings__ = {};
@@ -427,17 +427,17 @@ <h2 class="mt-1 subtitle-2 mb-2">{{ _('Two Factor Authentication Policies') }}</
     {% include 'admin/jsapi.jinja2' %}
 </script>
 
-<script src="/static/js/components/NotificationsList.js"></script>
-<script src="/static/js/vuetify.min.js"></script>
-<script src="/static/js/axios.min.js"></script>
-<script src="/static/js/vue-router.global.js"></script>
-<script src="/static/js/leaflet.js"></script>
-<script src="/static/js/common/config.js"></script>
+<script src="/static/js/components/NotificationsList.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vuetify.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/axios.min.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/vue-router.global.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/leaflet.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/common/config.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/leaflet-fullscreen/leaflet.fullscreen.min.js"></script>
+<script src="/static/leaflet-fullscreen/leaflet.fullscreen.min.js?v={{ config.VERSION }}"></script>
 
-<script src="/static/js/components/GeoMap.js"></script>
-<script src="/static/js/components/EditableTable.js"></script>
+<script src="/static/js/components/GeoMap.js?v={{ config.VERSION }}"></script>
+<script src="/static/js/components/EditableTable.js?v={{ config.VERSION }}"></script>
 
 {% block js %}
     <script nonce="{{ csp_nonce() }}" type="module">
diff --git a/tests/test_lookup_crud.py b/tests/test_lookup_crud.py
index 35a49c403..66f453e03 100644
--- a/tests/test_lookup_crud.py
+++ b/tests/test_lookup_crud.py
@@ -516,3 +516,23 @@ def test_lookup_search_by_translated_title(request, session, entity, list_url, f
     assert resp.status_code == 200
     ids = [i["id"] for i in resp.json["data"]["items"]]
     assert item.id in ids
+
+
+def test_label_mode2_includes_translated_title_and_path(session):
+    from enferno.admin.models import Label
+
+    root = Label(title="Root", title_ar="جذر")
+    session.add(root)
+    session.commit()
+    mid = Label(title="Mid", parent_label_id=root.id)
+    session.add(mid)
+    session.commit()
+    leaf = Label(title="Leaf", title_ar="ورقة", parent_label_id=mid.id)
+    session.add(leaf)
+    session.commit()
+
+    d = leaf.to_mode2()
+    assert d["title_ar"] == "ورقة"
+    assert d["path"] == "Root > Mid"
+    # untranslated ancestors fall back to their English title per level
+    assert d["path_ar"] == "جذر > Mid"