When OREO does calibrator then pulsar, pick them close to each other

When starting OREO with "Do Calibrator" and "Do Pulsar" selected, OREO will do an APF before the calibrator.  After observing the calibrator it often, especially at X band, chooses a pulsar that it so far away that it must point again.  It would same a not insignificant amount of time if it chose a calibrator close to the pulsar (which I guess ideally would be close to the first A star).