minors
Caling RegexTag from the right places (not only tests)