Restart the resolving and also adjust templates for repeat and hashtag rules