More fixes to work on the badge template links