diff --git a/commcare_connect/reports/queries.py b/commcare_connect/reports/queries.py
index e54a50a8..ed9ddf91 100644
--- a/commcare_connect/reports/queries.py
+++ b/commcare_connect/reports/queries.py
@@ -5,8 +5,8 @@
 def get_visit_map_queryset(base_queryset):
     return (
         base_queryset.annotate(
-            username_connectid=F("form_json__metadata__username"),
             deliver_unit_name=F("deliver_unit__name"),
+            username_connectid=KT("form_json__metadata__username"),
             timestart_str=KT("form_json__metadata__timeStart"),
             timeend_str=KT("form_json__metadata__timeEnd"),
             location_str=KT("form_json__metadata__location"),