few fixes with urls