Fix url escaping