improving TAGS support