diff --git a/peachjam/admin.py b/peachjam/admin.py
index 5de38e01a..8c3919b55 100644
--- a/peachjam/admin.py
+++ b/peachjam/admin.py
@@ -728,13 +728,13 @@ class LowerBenchInline(admin.TabularInline):
 
 class JudgmentRelationshipStackedInline(NonrelatedTabularInline):
     model = Relationship
-    fields = ["predicate", "subject_work"]
+    fields = ["predicate", "object_work"]
     verbose_name = "Related judgment"
     verbose_name_plural = "Related judgments"
     extra = 2
 
     def get_form_queryset(self, obj):
-        return Relationship.objects.filter(object_work=obj.work)
+        return Relationship.objects.filter(subject_work=obj.work)
 
     def save_new_instance(self, parent, instance):
         instance.object_work = parent.work
@@ -744,7 +744,7 @@ def get_formset(self, request, obj=None, **kwargs):
             request,
             obj,
             widgets={
-                "subject_work": autocomplete.ModelSelect2(url="autocomplete-works")
+                "object_work": autocomplete.ModelSelect2(url="autocomplete-works")
             },
             **kwargs,
         )
diff --git a/peachjam/views/autocomplete.py b/peachjam/views/autocomplete.py
index aab944165..2ffb3716d 100644
--- a/peachjam/views/autocomplete.py
+++ b/peachjam/views/autocomplete.py
@@ -1,4 +1,5 @@
 from dal import autocomplete
+from django.db.models import Q
 
 from peachjam.models import Work
 
@@ -11,6 +12,6 @@ def get_queryset(self):
 
         qs = Work.objects.all()
         if self.q:
-            qs = qs.filter(title__istartswith=self.q)
+            qs = qs.filter(Q(title__icontains=self.q) | Q(frbr_uri__icontains=self.q))
 
         return qs