Fix template logic
Merge branch 'master' of github.com:kesapojat/tmc-web-client