[TIMOB-14123] Created helper class for Uri redirect and other fixes