Issue #2316739 by eshta: Expanded regex used to remove unwanted IDs from the goal id.