Improvements for "for" custom tag
Improved tag matching