TISTUD-3770 - Fix template ordering