Better handling of response urls