Properly limit to name matches only if necessary
Resolve job packages after whitelist generation