REPAIR templatetag and ADD packaging