improved Tag-Index