diff --git a/djangocms_versioning/admin.py b/djangocms_versioning/admin.py
index e008b202..71174a44 100644
--- a/djangocms_versioning/admin.py
+++ b/djangocms_versioning/admin.py
@@ -92,9 +92,9 @@ def get_queryset(self, request, exclude_parameters=None):
 def versioning_change_list_factory(base_changelist_cls):
     """Generate a ChangeList class to use for the content model"""
     return type(
-        "Versioned" + base_changelist_cls.__name__,
+        f"Versioned{base_changelist_cls.__name__}",
         (VersioningChangeListMixin, base_changelist_cls),
-        {}
+        {},
     )
 
 
@@ -131,14 +131,10 @@ def get_changelist(self, request, **kwargs):
 
     change_form_template = "djangocms_versioning/admin/mixin/change_form.html"
 
-    def render_change_form(
-        self, request, context, add=False, change=False, form_url="", obj=None
-    ):
+    def render_change_form(self, request, context, add=False, change=False, form_url="", obj=None):
         """Add a link to the version table to the change form view"""
         if "versioning_fallback_change_form_template" not in context:
-            context[
-                "versioning_fallback_change_form_template"
-            ] = super().change_form_template
+            context["versioning_fallback_change_form_template"] = super().change_form_template
 
         return super().render_change_form(request, context, add=add, change=change, form_url=form_url, obj=obj)
 
@@ -157,12 +153,16 @@ def has_change_permission(self, request, obj=None):
 class StateIndicatorMixin(metaclass=MediaDefiningClass):
     """Mixin to provide state_indicator column to the changelist view of a content model admin. Usage::
 
-        class MyContentModelAdmin(StateIndicatorMixin, admin.ModelAdmin):
-            list_display = [..., "state_indicator", ...]
+    class MyContentModelAdmin(StateIndicatorMixin, admin.ModelAdmin):
+        list_display = [..., "state_indicator", ...]
     """
+
     class Media:
         # js for the context menu
-        js = ("admin/js/jquery.init.js", "djangocms_versioning/js/indicators.js",)
+        js = (
+            "admin/js/jquery.init.js",
+            "djangocms_versioning/js/indicators.js",
+        )
         # css for indicators and context menu
         css = {
             "all": (static_with_version("cms/css/cms.pagetree.css"),),
@@ -180,28 +180,38 @@ def _extra_grouping_fields(self):
     def get_indicator_column(self, request):
         def indicator(obj):
             if self._extra_grouping_fields is not None:  # Grouper Model
-                content_obj = get_latest_admin_viewable_content(obj, include_unpublished_archived=True, **{
-                    field: getattr(self, field) for field in self._extra_grouping_fields
-                })
+                content_obj = get_latest_admin_viewable_content(
+                    obj,
+                    include_unpublished_archived=True,
+                    **{field: getattr(self, field) for field in self._extra_grouping_fields},
+                )
             else:  # Content Model
                 content_obj = obj
             status = content_indicator(content_obj)
-            menu = content_indicator_menu(
-                request,
-                status,
-                content_obj._version,
-                back=request.path_info + "?" + request.GET.urlencode(),
-            ) if status else None
+            menu = (
+                content_indicator_menu(
+                    request,
+                    status,
+                    content_obj._version,
+                    back=f"{request.path_info}?{request.GET.urlencode()}",
+                )
+                if status
+                else None
+            )
             return render_to_string(
                 "admin/djangocms_versioning/indicator.html",
                 {
                     "state": status or "empty",
                     "description": INDICATOR_DESCRIPTIONS.get(status, _("Empty")),
                     "menu_template": "admin/cms/page/tree/indicator_menu.html",
-                    "menu": json.dumps(render_to_string("admin/cms/page/tree/indicator_menu.html",
-                                                        {"indicator_menu_items": menu})) if menu else None,
-                }
+                    "menu": json.dumps(
+                        render_to_string("admin/cms/page/tree/indicator_menu.html", {"indicator_menu_items": menu})
+                    )
+                    if menu
+                    else None,
+                },
             )
+
         indicator.short_description = self.indicator_column_label
         return indicator
 
@@ -215,8 +225,10 @@ def state_indicator(self, obj):
     def get_list_display(self, request):
         """Default behavior: replaces the text "state_indicator" by the indicator column"""
         if versionables.exists_for_content(self.model) or versionables.exists_for_grouper(self.model):
-            return tuple(self.get_indicator_column(request) if item == "state_indicator" else item
-                         for item in super().get_list_display(request))
+            return tuple(
+                self.get_indicator_column(request) if item == "state_indicator" else item
+                for item in super().get_list_display(request)
+            )
         else:
             # remove "state_indicator" entry
             return tuple(item for item in super().get_list_display(request) if item != "state_indicator")
@@ -281,7 +293,8 @@ class MyContentModelAdmin(ExtendedGrouperVersionAdminMixin, cms.admin.utils.Grou
                 "get_versioning_state",  # Adds the state (w/o interaction)
                 ...]
 
-        """
+    """
+
     def get_queryset(self, request: HttpRequest) -> models.QuerySet:
         """Annotates the username of the ``created_by`` field, the ``modified`` field (date time),
         and the ``state`` field of the version object to the grouper queryset."""
@@ -353,7 +366,6 @@ def can_change_content(self, request: HttpRequest, content_obj: models.Model) ->
         return version.check_modify.as_bool(request.user)
 
 
-
 class DefaultGrouperVersioningAdminMixin(StateIndicatorMixin, ExtendedGrouperVersionAdminMixin):
     """Default mixin for grouper model admin classes: Includes state indicator, author and modified date.
     Usage::
@@ -369,6 +381,7 @@ class MyContentModelAdmin(DefaultGrouperAdminMixin, cms.admin.utils.GrouperModel
     "admin_list_actions" field, or - together with the actions - at the end of the list_display
     if no actions are present.
     """
+
     def get_list_display(self, request):
         list_display = getattr(self, "list_display", ())
         if "state_indicator" not in list_display:
@@ -383,7 +396,11 @@ def get_list_display(self, request):
                 )
             else:
                 # Add the state indicator and admin_list_actions to the end of the list_display
-                self.list_display = (*list_display, "state_indicator", "admin_list_actions",)
+                self.list_display = (
+                    *list_display,
+                    "state_indicator",
+                    "admin_list_actions",
+                )
         return super().get_list_display(request)
 
 
@@ -515,9 +532,7 @@ def _get_edit_link(self, obj, request, disabled=False):
         )
         # Only show if no draft exists
         if version.state == PUBLISHED:
-            pks_for_grouper = version.versionable.for_content_grouping_values(
-                obj
-            ).values_list("pk", flat=True)
+            pks_for_grouper = version.versionable.for_content_grouping_values(obj).values_list("pk", flat=True)
             drafts = Version.objects.filter(
                 object_id__in=pks_for_grouper,
                 content_type=version.content_type,
@@ -642,7 +657,10 @@ class FakeFilter(admin.SimpleListFilter):
 
         def lookups(self, request, model_admin):
             if callable(lookups_):
-                return lookups_()
+                try:
+                    return lookups_(request, model_admin)
+                except TypeError:
+                    return lookups_()
             else:
                 return lookups_
 
@@ -653,24 +671,23 @@ def queryset(self, request, queryset):
 
 
 class VersionAdmin(ChangeListActionsMixin, admin.ModelAdmin, metaclass=MediaDefiningClass):
-    """Admin class used for version models.
-    """
+    """Admin class used for version models."""
 
     # register custom actions
     actions = ["compare_versions", "delete_selected"]
     list_display = (
-        "number",
-    ) + (
-        ("created",) if conf.VERBOSE_UI else ()
-    ) + (
-        "modified",
-        "content",
-        "created_by",
-    ) + (
-        ("locked",) if conf.LOCK_VERSIONS else ()
-    ) + (
-        "state",
-        "admin_list_actions",
+        ("number",)
+        + (("created",) if conf.VERBOSE_UI else ())
+        + (
+            "modified",
+            "content",
+            "created_by",
+        )
+        + (("locked",) if conf.LOCK_VERSIONS else ())
+        + (
+            "state",
+            "admin_list_actions",
+        )
     )
     list_display_links = None
 
@@ -692,10 +709,7 @@ def get_changelist(self, request, **kwargs):
     def get_list_filter(self, request):
         """Adds the filters for the extra grouping fields to the UI."""
         versionable = versionables.for_content(self.model._source_model)
-        return [
-            fake_filter_factory(versionable, field)
-            for field in versionable.extra_grouping_fields
-        ]
+        return [fake_filter_factory(versionable, field) for field in versionable.extra_grouping_fields]
 
     @admin.display(
         description=_("Content"),
@@ -713,9 +727,7 @@ def content_link(self, obj):
             label=content,
         )
 
-    @admin.display(
-        description=_("locked")
-    )
+    @admin.display(description=_("locked"))
     def locked(self, version):
         """
         Generate an locked field for Versioning Admin
@@ -738,8 +750,7 @@ def _get_preview_link(self, obj, request):
         )
 
     def _get_archive_link(self, obj, request, disabled=False):
-        """Helper function to get the html link to the archive action
-        """
+        """Helper function to get the html link to the archive action"""
         if not obj.can_be_archived():
             # Don't display the link if it can't be archived
             return ""
@@ -756,8 +767,7 @@ def _get_archive_link(self, obj, request, disabled=False):
         )
 
     def _get_publish_link(self, obj, request):
-        """Helper function to get the html link to the publish action
-        """
+        """Helper function to get the html link to the publish action"""
         if not obj.can_be_published():
             # Don't display the link if it can't be published
             return ""
@@ -776,8 +786,7 @@ def _get_publish_link(self, obj, request):
         )
 
     def _get_unpublish_link(self, obj, request, disabled=False):
-        """Helper function to get the html link to the unpublish action
-        """
+        """Helper function to get the html link to the unpublish action"""
         if not obj.can_be_unpublished():
             # Don't display the link if it can't be unpublished
             return ""
@@ -794,17 +803,14 @@ def _get_unpublish_link(self, obj, request, disabled=False):
         )
 
     def _get_edit_link(self, obj, request, disabled=False):
-        """Helper function to get the html link to the edit action
-        """
+        """Helper function to get the html link to the edit action"""
 
         if not obj.check_edit_redirect.as_bool(request.user):
             return ""
 
         # Only show if no draft exists
         if obj.state == PUBLISHED:
-            pks_for_grouper = obj.versionable.for_content_grouping_values(
-                obj.content
-            ).values_list("pk", flat=True)
+            pks_for_grouper = obj.versionable.for_content_grouping_values(obj.content).values_list("pk", flat=True)
             drafts = Version.objects.filter(
                 object_id__in=pks_for_grouper,
                 content_type=obj.content_type,
@@ -834,8 +840,7 @@ def _get_edit_link(self, obj, request, disabled=False):
         )
 
     def _get_revert_link(self, obj, request, disabled=False):
-        """Helper function to get the html link to the revert action
-        """
+        """Helper function to get the html link to the revert action"""
         if obj.state in (PUBLISHED, DRAFT):
             # Don't display the link if it's a draft or published
             return ""
@@ -853,8 +858,7 @@ def _get_revert_link(self, obj, request, disabled=False):
         )
 
     def _get_discard_link(self, obj, request, disabled=False):
-        """Helper function to get the html link to the discard action
-        """
+        """Helper function to get the html link to the discard action"""
         if obj.state != DRAFT:
             # Don't display the link if it's not a draft
             return ""
@@ -902,8 +906,7 @@ def _get_settings_link(self, obj, request):
 
         try:
             settings_url = reverse(
-                f"admin:{content_model._meta.app_label}_{content_model._meta.model_name}_change",
-                args=(obj.content.pk,)
+                f"admin:{content_model._meta.app_label}_{content_model._meta.model_name}_change", args=(obj.content.pk,)
             )
         except Resolver404:
             return ""
@@ -926,11 +929,15 @@ def get_state_actions(self):
         if settings.DEBUG:
             # Only introspect in DEBUG mode. Issue warning if method is monkey-patched
             import inspect
+
             caller_frame = inspect.getouterframes(inspect.currentframe(), 2)
             if caller_frame[1][3] != "get_actions_list":
-                warnings.warn("Modifying get_state_actions is deprecated. VersionAdmin.get_state_actions "
-                              "will be removed in a future version. Use get_actions_list instead.",
-                              DeprecationWarning, stacklevel=2)
+                warnings.warn(
+                    "Modifying get_state_actions is deprecated. VersionAdmin.get_state_actions "
+                    "will be removed in a future version. Use get_actions_list instead.",
+                    DeprecationWarning,
+                    stacklevel=2,
+                )
 
         return [
             self._get_preview_link,
@@ -944,9 +951,7 @@ def get_state_actions(self):
             self._get_settings_link,
         ]
 
-    @admin.action(
-        description=_("Compare versions")
-    )
+    @admin.action(description=_("Compare versions"))
     def compare_versions(self, request, queryset):
         """
         Redirects to a compare versions view based on a users choice
@@ -985,7 +990,7 @@ def delete_selected(self, request, queryset):
             self.message_user(
                 request,
                 _("Draft or published versions cannot be deleted. First unpublish or use discard for drafts."),
-                messages.ERROR
+                messages.ERROR,
             )
             return None
 
@@ -1001,9 +1006,7 @@ def get_deleted_objects(self, objs, request):
         return super().get_deleted_objects(objs, request)
 
     def get_content_queryset(self, queryset):
-        return self.model._source_model._base_manager.filter(
-            pk__in=queryset.values_list("object_id", flat=True)
-        )
+        return self.model._source_model._base_manager.filter(pk__in=queryset.values_list("object_id", flat=True))
 
     def grouper_form_view(self, request):
         """Displays an intermediary page to select a grouper object
@@ -1027,9 +1030,7 @@ def archive_view(self, request, object_id):
         # Check version exists
         version = self.get_object(request, unquote(object_id))
         if version is None:
-            return self._get_obj_does_not_exist_redirect(
-                request, self.model._meta, object_id
-            )
+            return self._get_obj_does_not_exist_redirect(request, self.model._meta, object_id)
 
         if not version.can_be_archived():
             self.message_user(request, _("Version cannot be archived"), messages.ERROR)
@@ -1051,9 +1052,7 @@ def archive_view(self, request, object_id):
                 ),
                 "back_url": self.back_link(request, version),
             }
-            return render(
-                request, "djangocms_versioning/admin/archive_confirmation.html", context
-            )
+            return render(request, "djangocms_versioning/admin/archive_confirmation.html", context)
         else:
             # Archive the version
             version.archive(request.user)
@@ -1068,16 +1067,12 @@ def publish_view(self, request, object_id):
         """
         # This view always changes data so only POST requests should work
         if request.method != "POST":
-            return HttpResponseNotAllowed(
-                ["POST"], _("This view only supports POST method.")
-            )
+            return HttpResponseNotAllowed(["POST"], _("This view only supports POST method."))
 
         # Check version exists
         version = self.get_object(request, unquote(object_id))
         if version is None:
-            return self._get_obj_does_not_exist_redirect(
-                request, self.model._meta, object_id
-            )
+            return self._get_obj_does_not_exist_redirect(request, self.model._meta, object_id)
 
         requested_redirect = request.GET.get("next", None)
         if conf.ON_PUBLISH_REDIRECT in ("preview", "published"):
@@ -1128,9 +1123,7 @@ def unpublish_view(self, request, object_id):
         # Check version exists
         version = self.get_object(request, unquote(object_id))
         if version is None:
-            return self._get_obj_does_not_exist_redirect(
-                request, self.model._meta, object_id
-            )
+            return self._get_obj_does_not_exist_redirect(request, self.model._meta, object_id)
 
         if conf.ON_PUBLISH_REDIRECT in ("preview", "published"):
             redirect_url = get_preview_url(version.content)
@@ -1138,9 +1131,7 @@ def unpublish_view(self, request, object_id):
             redirect_url = version_list_url(version.content)
 
         if not version.can_be_unpublished():
-            self.message_user(
-                request, _("Version cannot be unpublished"), messages.ERROR
-            )
+            self.message_user(request, _("Version cannot be unpublished"), messages.ERROR)
             return redirect(redirect_url)
         try:
             version.check_unpublish(request.user)
@@ -1162,9 +1153,7 @@ def unpublish_view(self, request, object_id):
             extra_context = OrderedDict(
                 [
                     (key, func(request, version))
-                    for key, func in _cms_extension()
-                    .add_to_context.get("unpublish", {})
-                    .items()
+                    for key, func in _cms_extension().add_to_context.get("unpublish", {}).items()
                 ]
             )
             context.update({"extra_context": extra_context})
@@ -1187,13 +1176,11 @@ def _get_edit_redirect_version(self, request, version):
         if version.state == PUBLISHED:
             # First check there is no draft record for this grouper
             # already.
-            pks_for_grouper = version.versionable.for_content_grouping_values(
-                version.content
-            ).values_list("pk", flat=True)
-            content_type = ContentType.objects.get_for_model(version.content)
-            drafts = Version.objects.filter(
-                object_id__in=pks_for_grouper, content_type=content_type, state=DRAFT
+            pks_for_grouper = version.versionable.for_content_grouping_values(version.content).values_list(
+                "pk", flat=True
             )
+            content_type = ContentType.objects.get_for_model(version.content)
+            drafts = Version.objects.filter(object_id__in=pks_for_grouper, content_type=content_type, state=DRAFT)
             if drafts.exists():
                 # There is a draft record so people should be editing
                 # the draft record not the published one. Redirect to draft.
@@ -1218,9 +1205,7 @@ def edit_redirect_view(self, request, object_id):
         """
         # This view always changes data so only POST requests should work
         if request.method != "POST":
-            return HttpResponseNotAllowed(
-                ["POST"], _("This view only supports POST method.")
-            )
+            return HttpResponseNotAllowed(["POST"], _("This view only supports POST method."))
 
         version = self.get_object(request, unquote(object_id))
         if version is None:
@@ -1249,9 +1234,7 @@ def revert_view(self, request, object_id):
             self.message_user(request, force_str(e), messages.ERROR)
             return redirect(version_list_url(version.content))
 
-        pks_for_grouper = version.versionable.for_content_grouping_values(
-            version.content
-        ).values_list("pk", flat=True)
+        pks_for_grouper = version.versionable.for_content_grouping_values(version.content).values_list("pk", flat=True)
         drafts = Version.objects.filter(
             object_id__in=pks_for_grouper,
             content_type=version.content_type,
@@ -1274,11 +1257,8 @@ def revert_view(self, request, object_id):
                 ),
                 "back_url": self.back_link(request, version),
             }
-            return render(
-                request, "djangocms_versioning/admin/revert_confirmation.html", context
-            )
+            return render(request, "djangocms_versioning/admin/revert_confirmation.html", context)
         else:
-
             if draft_version and request.POST.get("archive"):
                 draft_version.archive(request.user)
 
@@ -1313,9 +1293,7 @@ def discard_view(self, request, object_id):
                 ),
                 "back_url": self.back_link(request, version),
             }
-            return render(
-                request, "djangocms_versioning/admin/discard_confirmation.html", context
-            )
+            return render(request, "djangocms_versioning/admin/discard_confirmation.html", context)
 
         version_url = version_list_url(version.content)
         if request.POST.get("discard"):
@@ -1328,14 +1306,11 @@ def discard_view(self, request, object_id):
         return redirect(version_url)
 
     def compare_view(self, request, object_id):
-        """Compares two versions
-        """
+        """Compares two versions"""
         # Get version 1 (the version we're comparing against)
         v1 = self.get_object(request, unquote(object_id))
         if v1 is None:
-            return self._get_obj_does_not_exist_redirect(
-                request, self.model._meta, object_id
-            )
+            return self._get_obj_does_not_exist_redirect(request, self.model._meta, object_id)
         persist_params = {
             get_cms_setting("CMS_TOOLBAR_URL__DISABLE"): 1,
             get_cms_setting("CMS_TOOLBAR_URL__PERSIST"): 0,
@@ -1344,9 +1319,7 @@ def compare_view(self, request, object_id):
         v1_preview_url = add_url_parameters(v1_preview_url, **persist_params)
         # Get the list of versions for the grouper. This is for use
         # in the dropdown to choose a version.
-        version_list = Version.objects.filter_by_content_grouping_values(
-            v1.content
-        ).order_by("-number")
+        version_list = Version.objects.filter_by_content_grouping_values(v1.content).order_by("-number")
         # Add the above to context
         context = {
             "version_list": version_list,
@@ -1360,9 +1333,7 @@ def compare_view(self, request, object_id):
         if "compare_to" in request.GET:
             v2 = self.get_object(request, unquote(request.GET["compare_to"]))
             if v2 is None:
-                return self._get_obj_does_not_exist_redirect(
-                    request, self.model._meta, request.GET["compare_to"]
-                )
+                return self._get_obj_does_not_exist_redirect(request, self.model._meta, request.GET["compare_to"])
             else:
                 v2_preview_url = get_preview_url(v2.content)
                 context.update(
@@ -1371,9 +1342,7 @@ def compare_view(self, request, object_id):
                         "v2_preview_url": add_url_parameters(v2_preview_url, **persist_params),
                     }
                 )
-        return TemplateResponse(
-            request, "djangocms_versioning/admin/compare.html", context
-        )
+        return TemplateResponse(request, "djangocms_versioning/admin/compare.html", context)
 
     def unlock_view(self, request, object_id):
         """
@@ -1390,8 +1359,7 @@ def unlock_view(self, request, object_id):
         # Check version exists
         version = self.get_object(request, unquote(object_id))
         if version is None:
-            return self._get_obj_does_not_exist_redirect(
-                request, self.model._meta, object_id)
+            return self._get_obj_does_not_exist_redirect(request, self.model._meta, object_id)
 
         # Raise 404 if not locked
         if version.state != DRAFT:
@@ -1430,16 +1398,12 @@ def changelist_view(self, request, extra_context=None):
         if not request.GET:
             # redirect to grouper form when there's no GET parameters
             opts = self.model._meta
-            return redirect(
-                reverse(f"admin:{opts.app_label}_{opts.model_name}_grouper")
-            )
+            return redirect(reverse(f"admin:{opts.app_label}_{opts.model_name}_grouper"))
         extra_context = extra_context or {}
         versionable = versionables.for_content(self.model._source_model)
 
         try:
-            grouper = versionable.get_grouper_with_fallbacks(
-                int(request.GET.get(versionable.grouper_field_name))
-            )
+            grouper = versionable.get_grouper_with_fallbacks(int(request.GET.get(versionable.grouper_field_name)))
         except (TypeError, ValueError):
             grouper = None
         else:
@@ -1449,7 +1413,7 @@ def changelist_view(self, request, extra_context=None):
 
         if grouper:
             # CAVEAT: as the breadcrumb trails expect a value for latest content in the template
-            extra_context["latest_content"] = ({"pk": None})
+            extra_context["latest_content"] = {"pk": None}
 
             extra_context.update(
                 grouper=grouper,
@@ -1479,9 +1443,7 @@ def changelist_view(self, request, extra_context=None):
             # empty for the additional values.
             try:
                 response.context_data["latest_content"] = (
-                    response.context_data["cl"].get_queryset(request)
-                        .latest("created")
-                        .content
+                    response.context_data["cl"].get_queryset(request).latest("created").content
                 )
             except (ObjectDoesNotExist, KeyError):
                 pass
@@ -1550,8 +1512,10 @@ def has_delete_permission(self, request, obj=None):
         if obj is None:
             return conf.ALLOW_DELETING_VERSIONS and super().has_delete_permission(request, obj)
         content_admin = self.admin_site._registry[self.model._source_model]
-        return all((
-            conf.ALLOW_DELETING_VERSIONS,
-            super().has_delete_permission(request, obj),
-            content_admin.has_delete_permission(request, obj.content),
-        ))
+        return all(
+            (
+                conf.ALLOW_DELETING_VERSIONS,
+                super().has_delete_permission(request, obj),
+                content_admin.has_delete_permission(request, obj.content),
+            )
+        )
diff --git a/djangocms_versioning/cms_config.py b/djangocms_versioning/cms_config.py
index 45f7b6ad..dde353be 100644
--- a/djangocms_versioning/cms_config.py
+++ b/djangocms_versioning/cms_config.py
@@ -8,6 +8,7 @@
 from cms.utils.urlutils import admin_reverse
 from django.conf import settings
 from django.contrib.admin.utils import flatten_fieldsets
+from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import (
     ImproperlyConfigured,
     ObjectDoesNotExist,
@@ -52,13 +53,10 @@ def __init__(self):
     @cached_property
     def versionables_by_content(self):
         """Returns a dict of {content_model_cls: VersionableItem obj}"""
-        return {
-            versionable.content_model: versionable for versionable in self.versionables
-        }
+        return {versionable.content_model: versionable for versionable in self.versionables}
 
     def is_content_model_versioned(self, content_model):
-        """Returns if the content model is registered for versioning.
-        """
+        """Returns if the content model is registered for versioning."""
         return content_model in self.versionables_by_content
 
     @cached_property
@@ -91,9 +89,7 @@ def handle_versioning_setting(self, cms_config):
             # still changing and needs to be calculated on the fly
             registered_so_far = [v.content_model for v in self.versionables]
             if versionable.content_model in registered_so_far:
-                raise ImproperlyConfigured(
-                    f"{versionable.content_model!r} has already been registered"
-                )
+                raise ImproperlyConfigured(f"{versionable.content_model!r} has already been registered")
             # Checks passed. Add versionable to our master list
             self.versionables.append(versionable)
 
@@ -118,15 +114,13 @@ def handle_admin_classes(self, cms_config):
         with an admin model class that inherits from `versionable.content_admin_mixin`.
         """
         replace_admin_for_models(
-            [
-                (versionable.content_model, versionable.content_admin_mixin)
-                for versionable in cms_config.versioning
-            ]
+            [(versionable.content_model, versionable.content_admin_mixin) for versionable in cms_config.versioning]
         )
         replace_admin_for_models(
             [
                 (versionable.grouper_model, versionable.grouper_admin_mixin)
-                for versionable in cms_config.versioning if versionable.grouper_admin_mixin is not None
+                for versionable in cms_config.versioning
+                if versionable.grouper_admin_mixin is not None
             ]
         )
 
@@ -153,12 +147,15 @@ def handle_content_model_manager(self, cms_config):
         """
         for versionable in cms_config.versioning:
             replace_manager(versionable.content_model, "objects", PublishedContentManagerMixin)
-            replace_manager(versionable.content_model, "admin_manager", AdminManagerMixin,
-                            _group_by_key=list(versionable.grouping_fields))
+            replace_manager(
+                versionable.content_model,
+                "admin_manager",
+                AdminManagerMixin,
+                _group_by_key=list(versionable.grouping_fields),
+            )
 
     def handle_admin_field_modifiers(self, cms_config):
-        """Allows for the transformation of a given field in the ExtendedVersionAdminMixin
-        """
+        """Allows for the transformation of a given field in the ExtendedVersionAdminMixin"""
         extended_admin_field_modifiers = getattr(cms_config, "extended_admin_field_modifiers", None)
         if not isinstance(extended_admin_field_modifiers, list):
             raise ImproperlyConfigured("extended_admin_field_modifiers must be list of dictionaries")
@@ -171,9 +168,7 @@ def configure_app(self, cms_config):
             self.handle_admin_field_modifiers(cms_config)
         # Validation to ensure either the versioning or the
         # versioning_add_to_confirmation_context config has been defined
-        has_extra_context = hasattr(
-            cms_config, "versioning_add_to_confirmation_context"
-        )
+        has_extra_context = hasattr(cms_config, "versioning_add_to_confirmation_context")
         has_models_to_register = hasattr(cms_config, "versioning")
         if not has_extra_context and not has_models_to_register:
             raise ImproperlyConfigured(
@@ -257,9 +252,11 @@ def get_readonly_fields(self, request, obj=None):
         return fields
 
     def get_queryset(self, request):
-        queryset = super().get_queryset(request)\
+        return (
+            super()
+            .get_queryset(request)
             .prefetch_related(Prefetch("versions", to_attr="prefetched_versions"))
-        return queryset
+        )
 
     def copy_language(self, request, object_id):
         target_language = request.POST.get("target_language")
@@ -338,18 +335,18 @@ def get_indicator_menu(cls, request, page_content):
 
 
 class VersioningCMSConfig(CMSAppConfig):
-    """Implement versioning for core cms models
-    """
+    """Implement versioning for core cms models"""
+
     cms_enabled = True
-    djangocms_versioning_enabled = getattr(
-        settings, "VERSIONING_CMS_MODELS_ENABLED", True
-    )
+    djangocms_versioning_enabled = getattr(settings, "VERSIONING_CMS_MODELS_ENABLED", True)
     versioning = [
         VersionableItem(
             content_model=PageContent,
             grouper_field_name="page",
             extra_grouping_fields=["language"],
-            version_list_filter_lookups={"language": get_language_tuple},
+            version_list_filter_lookups={
+                "language": lambda *args: get_language_tuple(site_id=get_current_site(args[0]).pk)
+            },
             copy_function=copy_page_content,
             grouper_selector_option_label=label_from_instance,
             on_publish=on_page_content_publish,
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
index 5c7188da..77611f25 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
@@ -17,12 +17,12 @@ <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %}Version number: {{ version_number }}{% endblocktrans %}</h4>
 <form action="" method="POST">
     {% csrf_token %}
-    <div class="submit-row">
+    <div>
         <input  class="button confirm-link js-versioning-keep-sideframe default"
                 type="submit"
                 name="discard"
                 value="{% translate "Yes, I'm sure" %}">
-        <a href="{{ back_url }}" class="cancel-link js-versioning-keep-sideframe" role="button">
+        <a href="{{ back_url }}" class="button cancel-link js-versioning-keep-sideframe" role="button">
             {% translate 'No, take me back' %}
         </a>
     </div>
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/grouper_form.html b/djangocms_versioning/templates/djangocms_versioning/admin/grouper_form.html
index c0d56b40..4616f37a 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/grouper_form.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/grouper_form.html
@@ -41,7 +41,9 @@
             </div>
           </div>
         </fieldset>
-        <button type="submit">{% translate "Submit" %}</button>
+        <div class="submit-row">
+          <input type="submit" value="{% translate "Submit" %}" class="default"/>
+        </div>
         </form>
       </form>
     </div>