diff --git a/.github/GitReleaseManager/.templates/default/issue-note.sbn b/.github/GitReleaseManager/.templates/default/issue-note.sbn
index 10c10a9..03dc651 100644
--- a/.github/GitReleaseManager/.templates/default/issue-note.sbn
+++ b/.github/GitReleaseManager/.templates/default/issue-note.sbn
@@ -1,6 +1,6 @@
 {{
     if issue_label == "Bug" || issue_label == "Bug Fix" || issue_label == "Bug Fixes"
-}}- Fix - {{ issue.title }} - see [#{{ issue.number }}]({{ issue.html_url }}).
+}}- Fix - {{ issue.title }} - see [#{{ issue.public_number }}]({{ issue.html_url }}).
 {{  else
-}}- {{ issue.title }} - see [#{{ issue.number }}]({{ issue.html_url }}).
+}}- {{ issue.title }} - see [#{{ issue.public_number }}]({{ issue.html_url }}).
 {{  end -}}
diff --git a/.github/GitReleaseManager/.templates/default/release-info.sbn b/.github/GitReleaseManager/.templates/default/release-info.sbn
index 8410ca5..2b495d2 100644
--- a/.github/GitReleaseManager/.templates/default/release-info.sbn
+++ b/.github/GitReleaseManager/.templates/default/release-info.sbn
@@ -1,9 +1,9 @@
 {{
     if issues.count > 0
         if commits.count > 0
-}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}) which resulted in [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?closed=1) being closed.
+}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}) which resulted in [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) being closed.
 {{      else
-}}As part of this release we had [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?closed=1) closed.
+}}As part of this release we had [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) closed.
 {{      end
     else if commits.count > 0
 }}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}).