Fix typo + support angular-like templates