Fix broken template tags

Fixes the bcc8a95 fix