Update regex to consider the 'track by ' ngrepeat stuff.
Update regex for btf-dragon.
Add 'track by ' to expression.