Tag improved handling