Refactored regex for goal params.