Watch template file
Remove useless code
Move select function position