diff --git a/lib/pangea/analytics_details_popup/lemma_use_example_messages.dart b/lib/pangea/analytics_details_popup/lemma_use_example_messages.dart
index 86dbc3364..f18e9aeda 100644
--- a/lib/pangea/analytics_details_popup/lemma_use_example_messages.dart
+++ b/lib/pangea/analytics_details_popup/lemma_use_example_messages.dart
@@ -7,9 +7,7 @@ import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
-import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
-import 'package:fluffychat/pangea/analytics_misc/learning_skills_enum.dart';
 import 'package:fluffychat/pangea/constructs/construct_level_enum.dart';
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
@@ -26,10 +24,7 @@ class LemmaUseExampleMessages extends StatelessWidget {
   Future<List<ExampleMessage>> _getExampleMessages() async {
     final List<ExampleMessage> examples = [];
     for (final OneConstructUse use in construct.cappedUses) {
-      if (use.useType.skillsEnumType != LearningSkillsEnum.writing ||
-          use.metadata.eventId == null ||
-          use.form == null ||
-          use.xp <= 0) {
+      if (use.metadata.eventId == null || use.form == null || use.xp <= 0) {
         continue;
       }
 
diff --git a/lib/pangea/toolbar/message_selection_overlay.dart b/lib/pangea/toolbar/message_selection_overlay.dart
index ed66f5c79..3d0769fe8 100644
--- a/lib/pangea/toolbar/message_selection_overlay.dart
+++ b/lib/pangea/toolbar/message_selection_overlay.dart
@@ -222,6 +222,8 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
         "word-zoom-card-${token.text.uniqueKey}",
         token,
         Matrix.of(context).analyticsDataService,
+        roomId: event.room.id,
+        eventId: event.eventId,
       ).then((_) {
         if (mounted) setState(() {});
       });