Follow-up from "[JES] Pull blacklists changes back in to current version of develop."

The following discussion from !275 (merged) should be addressed:

• @bwrona started a discussion:

  I want to have the same flow for live and initial sync. Why here this is implemented separately?