Fixed url escaping issue