Match length validators everywhere
Template syntax fixes