revising regex to match different link formats