More fixes to resubmit logic for NLO gridpack creation