@tristen - any reason we echo the URL here? Let's just add to the URL instead of replacing it, no?