TIMOB-17016-Moved the code that assign the tag name to proxy