diff --git a/apps/collection/views/common.py b/apps/collection/views/common.py
index da9ded41..a6f1297f 100644
--- a/apps/collection/views/common.py
+++ b/apps/collection/views/common.py
@@ -65,7 +65,8 @@ class CollectionEstablishmentListView(CollectionListView):
         # May raise a permission denied
         self.check_object_permissions(self.request, collection)
 
-        return collection.establishments.published().annotate_in_favorites(self.request.user)
+        return collection.establishments.published().annotate_in_favorites(self.request.user) \
+            .with_base_related().with_extended_related()
 
 
 # Guide
diff --git a/apps/establishment/models.py b/apps/establishment/models.py
index 325d9d8d..53baac0b 100644
--- a/apps/establishment/models.py
+++ b/apps/establishment/models.py
@@ -775,8 +775,9 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin,
     @property
     def main_image(self):
         qs = self.establishment_gallery.main_image()
-        if qs.exists():
-            return qs.first().image
+        image_model = qs.first()
+        if image_model is not None:
+            return image_model.image
 
     @property
     def restaurant_category_indexing(self):
diff --git a/project/settings/base.py b/project/settings/base.py
index 0b5b9c20..755aa830 100644
--- a/project/settings/base.py
+++ b/project/settings/base.py
@@ -536,3 +536,5 @@ COOKIE_DOMAIN = None
 
 ELASTICSEARCH_DSL = {}
 ELASTICSEARCH_INDEX_NAMES = {}
+
+THUMBNAIL_FORCE_OVERWRITE = True