Cleanup and support for destination_url parameter

predictable order of keys