Reworked issue with re-orgs and block tagging.