diff --git a/xfel/ui/components/xfel_gui_dialogs.py b/xfel/ui/components/xfel_gui_dialogs.py
index 2e04f97697..748d8d8eaa 100644
--- a/xfel/ui/components/xfel_gui_dialogs.py
+++ b/xfel/ui/components/xfel_gui_dialogs.py
@@ -605,7 +605,7 @@ def __init__(self, parent, params,
       pass
     self.Bind(wx.EVT_CHOICE, self.onMultiprocessingChoice, self.mp_option.ctr)
 
-    if params.facility.name == 'lcls':
+    if params.facility.name == 'lcls' and params.mp.method == 'lsf':
       # Queue
       queues = ['psanaq', 'psanaq', 'psdebugq','psanaidleq', 'psnehhiprioq',
                 'psnehprioq', 'psnehq', 'psfehhiprioq', 'psfehprioq', 'psfehq']
@@ -907,17 +907,15 @@ def onOK(self, e):
 
     self.params.mp.method = self.mp_option.ctr.GetStringSelection()
 
-    if self.params.facility.name == 'lcls':
+    if self.params.facility.name == 'lcls' and self.params.mp.method == "lsf":
       self.params.mp.queue = self.queue.ctr.GetStringSelection()
     else:
       if self.mp_option.ctr.GetStringSelection() == 'shifter':
-        print("follows a")
         self.params.mp.queue = self.queue.ctr.GetValue()
         self.params.mp.nnodes = int(self.nnodes.ctr.GetValue())
         self.params.mp.nproc_per_node = int(self.nproc_per_node.ctr.GetValue())
         self.params.mp.wall_time = int(self.wall_time.ctr.GetValue())
       else:
-        print("follows b")
         self.params.mp.queue = self.queue.ctr.GetValue()
         self.params.mp.nproc_per_node = int(self.nproc_per_node.ctr.GetValue())
         self.params.mp.env_script = [self.env_script.ctr.GetValue()]
diff --git a/xfel/util/mp.py b/xfel/util/mp.py
index d2c95780aa..d47433e7b9 100644
--- a/xfel/util/mp.py
+++ b/xfel/util/mp.py
@@ -548,7 +548,7 @@ def eval_params(self):
 
     # --qos <queue>
     self.sbatch_contents = self.substitute(self.sbatch_contents, "<queue>",
-      self.params.shifter.partition)
+      self.params.queue)
 
     # --partition <partition>
     self.sbatch_contents = self.substitute(self.sbatch_contents, "<partition>",
@@ -571,10 +571,6 @@ def eval_params(self):
     self.sbatch_contents = self.substitute(self.sbatch_contents, "<constraint>",
       self.params.shifter.constraint)
 
-    # --constraint
-    self.sbatch_contents = self.substitute(self.sbatch_contents, "<constraint>",
-      self.params.shifter.constraint)
-
     self.sbatch_contents = self.substitute(self.sbatch_contents, "<out_log>",
       os.path.join(self.destination , "out.log"))