Templates: update after some string breakage