Cleanup and support for destination_url parameter

added for clearer intent