diff --git a/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj b/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj
index 32c844c6..fe84db99 100644
--- a/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj
+++ b/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Cake.Testing" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.9.0-beta0002" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.9.0-beta0004" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj
index b0ed8bf1..74fec845 100644
--- a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj
+++ b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Gazorator" Version="0.5.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues" Version="0.9.0-beta0002" />
-    <PackageReference Include="Cake.Issues.Reporting" Version="0.9.0-beta0001" />
+    <PackageReference Include="Cake.Issues" Version="0.9.0-beta0004" />
+    <PackageReference Include="Cake.Issues.Reporting" Version="0.9.0-beta0002" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <Version>3.0.0</Version>
diff --git a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
index 8a8d7ad7..eec33630 100644
--- a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
+++ b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs
@@ -141,9 +141,9 @@ public static ExpandoObject GetExpandoObject(
                     fallbackToTextMessageIfMarkdownMessageNotAvailable ? issue.Message(IssueCommentFormat.Markdown) : issue.MessageMarkdown;
             }
 
-            if (fileLinkSettings != null && !string.IsNullOrEmpty(fileLinkSettings.FileLinkPattern))
+            if (fileLinkSettings != null)
             {
-                result.FileLink = fileLinkSettings.FileLinkPattern.ReplaceIssuePattern(issue);
+                result.FileLink = fileLinkSettings.GetFileLink(issue);
             }
 
             if (additionalValues != null)
diff --git a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
index 017e96dc..67495fcb 100644
--- a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
+++ b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
@@ -46,7 +46,7 @@
     ColumnSortOrder messageSortOrder = ViewBagHelper.ValueOrDefault(ViewBag.MessageSortOder, ColumnSortOrder.Ascending);
     var groupedColumns = ViewBagHelper.ValueOrDefault(ViewBag.GroupedColumns, new List<ReportColumn> { ReportColumn.ProviderName });
     var sortedColumns = ViewBagHelper.ValueOrDefault(ViewBag.SortedColumns, new List<ReportColumn> { ReportColumn.PriorityName, ReportColumn.ProjectName, ReportColumn.FileDirectory, ReportColumn.FileName, ReportColumn.Line });
-    FileLinkSettings fileLinkSettings = ViewBagHelper.ValueOrDefault(ViewBag.FileLinkSettings, new FileLinkSettings());
+    FileLinkSettings fileLinkSettings = ViewBagHelper.ValueOrDefault<FileLinkSettings>(ViewBag.FileLinkSettings, null);
     IdeIntegrationSettings ideIntegrationSettings = ViewBagHelper.ValueOrDefault<IdeIntegrationSettings>(ViewBag.IdeIntegrationSettings, null);
     List<HtmlDxDataGridColumnDescription> additionalColumns = ViewBagHelper.ValueOrDefault(ViewBag.AdditionalColumns, new List<HtmlDxDataGridColumnDescription>());
     string jQueryLocation = ViewBagHelper.ValueOrDefault(ViewBag.JQueryLocation, "https://ajax.aspnetcdn.com/ajax/jquery/").Trim();
@@ -417,7 +417,7 @@
                                     @:sortIndex: @sortedColumns.IndexOf(ReportColumn.Line),
                                     @:sortOrder: "@lineSortOrder.ToShortString()",
                                 }
-                                @if (fileLinkSettings != null && !string.IsNullOrWhiteSpace(fileLinkSettings.FileLinkPattern))
+                                @if (fileLinkSettings != null)
                                 {
                                     <text>
                                         cellTemplate: function (container, options) {