diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index d4ea83981..e0850fbcb 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -143,6 +143,9 @@ class Message extends StatelessWidget {
             return ActivitySummary(
               activity: event.room.activityPlan!,
               room: event.room,
+              assignedRoles: event.room.hasArchivedActivity
+                  ? event.room.activityRoles?.roles ?? {}
+                  : event.room.assignedRoles ?? {},
               showInstructions: show,
               toggleInstructions: controller.toggleShowInstructions,
               getParticipantOpacity: (role) =>
diff --git a/lib/pangea/activity_sessions/activity_summary_widget.dart b/lib/pangea/activity_sessions/activity_summary_widget.dart
index 716586540..b9173f5c2 100644
--- a/lib/pangea/activity_sessions/activity_summary_widget.dart
+++ b/lib/pangea/activity_sessions/activity_summary_widget.dart
@@ -15,7 +15,6 @@ import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_participant_list.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart';
-import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_session_details_row.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/common/utils/overlay.dart';
@@ -30,7 +29,7 @@ class ActivitySummary extends StatelessWidget {
   final ActivityPlanModel activity;
   final Room? room;
   final Room? course;
-  final Map<String, ActivityRoleModel>? assignedRoles;
+  final Map<String, ActivityRoleModel> assignedRoles;
 
   final bool showInstructions;
   final VoidCallback toggleInstructions;
@@ -45,7 +44,7 @@ class ActivitySummary extends StatelessWidget {
     required this.activity,
     required this.showInstructions,
     required this.toggleInstructions,
-    this.assignedRoles,
+    required this.assignedRoles,
     this.onTapParticipant,
     this.canSelectParticipant,
     this.isParticipantSelected,
@@ -81,7 +80,7 @@ class ActivitySummary extends StatelessWidget {
             ActivityParticipantList(
               activity: activity,
               room: room,
-              assignedRoles: room?.assignedRoles ?? assignedRoles ?? {},
+              assignedRoles: assignedRoles,
               course: course,
               onTap: onTapParticipant,
               canSelect: canSelectParticipant,
diff --git a/lib/pangea/course_plans/course_activities/activity_summaries_provider.dart b/lib/pangea/course_plans/course_activities/activity_summaries_provider.dart
index 0fdef8f17..646a2e9a4 100644
--- a/lib/pangea/course_plans/course_activities/activity_summaries_provider.dart
+++ b/lib/pangea/course_plans/course_activities/activity_summaries_provider.dart
@@ -95,9 +95,7 @@ mixin ActivitySummariesProvider<T extends StatefulWidget> on State<T> {
       final topicId = course.topicIds[i];
       final topic = course.loadedTopics[topicId];
       if (topic == null) continue;
-      if (!topic.activityListComplete) {
-        return null;
-      }
+      if (!topic.activityListComplete) continue;
 
       if (!_hasCompletedTopic(userID, topic) && topic.activityIds.isNotEmpty) {
         return topicId;
diff --git a/lib/pangea/learning_settings/utils/p_language_store.dart b/lib/pangea/learning_settings/utils/p_language_store.dart
index e0ea88727..9c0d97863 100644
--- a/lib/pangea/learning_settings/utils/p_language_store.dart
+++ b/lib/pangea/learning_settings/utils/p_language_store.dart
@@ -23,7 +23,10 @@ class PLanguageStore {
 
   List<LanguageModel> get unlocalizedTargetOptions => _langList
       .where(
-        (element) => element.l2 && element.langCode == element.langCodeShort,
+        (element) =>
+            element.l2 &&
+            (element.langCode == element.langCodeShort ||
+                !element.displayName.contains("(")),
       )
       .toList();