Reorganize the template tag