Tag - improvements

Translate