small improvement in track_template