#132 Url resolving mechanism fixed