Added custom template tag