Improve goo.gl pattern to guarentee a link is present