Better SpacePicker URL Handling