Improve logic for publishing RI direct vs. through exploratory Fix store failed job being called twice