diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f6d3c48..95f837d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,9 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: '🐛'
 labels: type/bug
-assignees: 
+assignees:
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/document_issue.md b/.github/ISSUE_TEMPLATE/document_issue.md
new file mode 100644
index 0000000..6faf7db
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/document_issue.md
@@ -0,0 +1,20 @@
+---
+name: Document request
+about: Request a change to documentation
+title: '📚'
+labels: type/docs
+assignees:
+
+---
+
+**Is your request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 551ba12..8ce8220 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: type/feature, type/question
-assignees: 
+title: '✨'
+labels: type/feature
+assignees:
 
 ---
 
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/pull_request_template.md
similarity index 92%
rename from .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
rename to .github/pull_request_template.md
index ec8e221..6c1f2e7 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -12,6 +12,6 @@ Fixes # (issue)
 
 ## Checklist:
 
-- [ ] I read & comply with the [contributing guidelines](https://github.com/luketainton/FHeD/blob/master/CONTRIBUTING.md)
+- [ ] I read & comply with the [contributing guidelines](https://github.com/luketainton/FHeD/blob/main/.github/CONTRIBUTING.md)
 - [ ] I have tested my code for new features & regressions on both mobile & desktop devices, using the latest version of major browsers.
 - [ ] I have made corresponding changes the documentation (README.md).
diff --git a/app/includes/app_functions.php b/app/includes/app_functions.php
index 293a02b..5e2e050 100644
--- a/app/includes/app_functions.php
+++ b/app/includes/app_functions.php
@@ -69,14 +69,14 @@
 
   function get_open_subscribed_requests($db) {
       $requests = array();
-      $sub_tickets_stmt = "SELECT ticket_uuid FROM ticket_subscribers WHERE user_uuid=:uuid AND status != 'Closed'";
+      $sub_tickets_stmt = "SELECT ticket_uuid FROM ticket_subscribers WHERE user_uuid=:uuid";
       $sub_tickets_sql = $db->prepare($sub_tickets_stmt);
       $sub_tickets_sql->bindParam(':uuid', $_SESSION['uuid']);
       $sub_tickets_sql->execute();
       $sub_tickets_sql->setFetchMode(PDO::FETCH_ASSOC);
       $sub_tickets_result = $sub_tickets_sql->fetchAll();
       foreach ($sub_tickets_result as $tkt) {
-        $stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
+        $stmt = "SELECT * FROM tickets WHERE uuid=:uuid  AND status != 'Closed'";
         $sql = $db->prepare($stmt);
         $sql->bindParam(':uuid', $tkt['ticket_uuid']);
         $sql->execute();