Applying new changes of GetURLFor method