diff --git a/collective/behavior/relatedmedia/related_images.pt b/collective/behavior/relatedmedia/related_images.pt
index 18831790..5aafd992 100644
--- a/collective/behavior/relatedmedia/related_images.pt
+++ b/collective/behavior/relatedmedia/related_images.pt
@@ -9,28 +9,16 @@
      i18n:domain="collective.behavior.relatedmedia"
 >
 
-  <a rel="prettyPhoto[relatedImages]"
-     data-fancybox="relatedImages"
-     tal:repeat="img images"
-     data-caption="${img/title}"
-     href="${img/url}"
-     class="image-item uuid-${img/uuid} ${python:repeat['img'].start and ' first' or ''}"
-  >
-    <img tal:replace="structure img/tag" />
-    <span class="caption"
-          tal:condition="img/show_caption|nothing"
-    >
-      <span class="caption-title">${img/title}</span>
-      <span class="caption-description">${img/description}</span>
-    </span>
+  <a tal:repeat="img images" class="image-item mb-3 ${python:'first' if repeat['img'].start else ''}" rel="prettyPhoto[relatedImages]" data-fancybox="relatedImages"
+      href="${img/url}" data-caption="${img/title}">
+      <img tal:replace="structure img/tag" />
+      <span class="caption small clearfix text-body-secondary lh-1"
+            tal:condition="img/show_caption|nothing">
+        <span class="caption-title">${img/title}</span>
+        <span class="caption-description">${img/description}</span>
+      </span>
   </a>
 
-  <a href="${context/absolute_url}/@@edit-gallery"
-     class="btn btn-secondary edit-gallery pat-plone-modal"
-     data-pat-plone-modal='{"modalSizeClass": "modal-xl"}'
-     i18n:translate=""
-     tal:condition="view/can_edit">edit gallery</a>
-
   <div class="discreet"
        tal:condition="not:images"
        i18n:translate=""
diff --git a/collective/behavior/relatedmedia/upgrades.py b/collective/behavior/relatedmedia/upgrades.py
index 1c244a6b..a3964a63 100644
--- a/collective/behavior/relatedmedia/upgrades.py
+++ b/collective/behavior/relatedmedia/upgrades.py
@@ -34,7 +34,10 @@ def migrate_base_path_relations(context):
 
     catalog = api.portal.get_tool("portal_catalog")
     items = catalog(
-        object_provides="collective.behavior.relatedmedia.behavior.IRelatedMedia",
+        object_provides=[
+            "collective.behavior.relatedmedia.interfaces.IRelatedMedia",  # old name
+            IRelatedMediaBehavior.__identifier__,
+        ]
     )
     _num_items = len(items)
 
@@ -62,7 +65,13 @@ def migrate_base_path_relations(context):
 
         logger.info(f"{idx}/{_num_items} migrating {item.getPath()}.")
 
-        for media in catalog(path=base_path.to_path):
+        for media in catalog(
+            path={
+                "query": base_path.to_path,
+                "depth": 1,
+            },
+            sort_on="getObjPositionInParent",
+        ):
             # related images
             if media.portal_type == "Image":
                 img_obj = media.getObject()
diff --git a/collective/behavior/relatedmedia/utils.py b/collective/behavior/relatedmedia/utils.py
index 18374d54..4824b05a 100644
--- a/collective/behavior/relatedmedia/utils.py
+++ b/collective/behavior/relatedmedia/utils.py
@@ -70,22 +70,11 @@ def get_related_media(context, portal_type=None):
 
     context = aq_inner(context)
     rm_behavior = IRelatedMedia(context, None)
+    rel_media = []
 
     if not rm_behavior:
-        return []
+        return rel_media
 
-    rel_media = []
-    if rm_behavior.related_media_base_path:
-        try:
-            rm_base = rm_behavior.related_media_base_path.to_object
-            rel_media = [
-                i.getObject()
-                for i in rm_base.restrictedTraverse("@@contentlisting")(
-                    portal_type=portal_type
-                )
-            ]
-        except Exception:
-            rel_media = []
     if portal_type in ("Image", None):
         rel_media += [i.to_object for i in rm_behavior.related_images if i.to_object]
     elif portal_type in ("File", None):