added url escaping