diff --git a/entries/views.py b/entries/views.py
index 659a18d63b5cd409e758ee90bc8ebd33f228be09..ce69c16983c066debdff8c4fe9afa160273b3566 100644
--- a/entries/views.py
+++ b/entries/views.py
@@ -423,7 +423,7 @@ def get_entries(request):
             assert(not errors_dict)
         
         linked_ids = set()
-        if request.session['show_linked_entries'] and not with_lexical_units:
+        if request.session['show_linked_entries'] and has_unified_frame != 'true':
             entries_linked = Entry.objects.filter(pk__in=(
                 Entry.objects
                 .filter(subentries__schema_hooks__argument_connections__schema_connections__subentry__entry__in=entries)
@@ -481,7 +481,7 @@ def get_entries(request):
         def iter_lexical_units(e):
             for lu in e.lexical_units.all():
                 lu._frame = lu._frames[0] if lu._frames and len(lu._frames) > 0 else None
-                if lu._frame is None or not hasattr(lu._frame, 'slowal_frame_2_unified_frame'):
+                if lu._frame is None or (not hasattr(lu._frame, 'slowal_frame_2_unified_frame') and has_unified_frame == 'true'):
                     continue
                 else:
                     yield lu