rearrange replace tag functions

This enables support for the Contributor Notifications