diff --git a/pandaharvester/harvestermisc/info_utils.py b/pandaharvester/harvestermisc/info_utils.py
index d1452e47..dca3615b 100644
--- a/pandaharvester/harvestermisc/info_utils.py
+++ b/pandaharvester/harvestermisc/info_utils.py
@@ -90,11 +90,10 @@ def is_grandly_unified_queue(self, panda_resource):
             return False
 
         # initial, temporary nomenclature
-        if 'grandly_unified' in panda_queue_dict.get('catchall'):
+        if 'grandly_unified' in panda_queue_dict.get('catchall') \
+                or panda_queue_dict.get('type') == 'unified':
             return True
 
-        # TODO: implement the final nomenclature
-
         return False
 
     # get harvester params
diff --git a/pandaharvester/harvestersubmitter/htcondor_submitter.py b/pandaharvester/harvestersubmitter/htcondor_submitter.py
index fb9baa63..feb30ab5 100644
--- a/pandaharvester/harvestersubmitter/htcondor_submitter.py
+++ b/pandaharvester/harvestersubmitter/htcondor_submitter.py
@@ -775,7 +775,7 @@ def _choose_proxy(workspec):
             """
             job_type = workspec.jobType
             proxy = self.x509UserProxy
-            if is_grandly_unified_queue and (job_type == 'user' or job_type == 'analysis') and self.x509UserProxyAnalysis:
+            if is_grandly_unified_queue and job_type in ('user', 'panda', 'analysis') and self.x509UserProxyAnalysis:
                 tmpLog.debug('Taking analysis proxy')
                 proxy = self.x509UserProxyAnalysis
             else: