diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d92..cc6fb24f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +1,29 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-
+title: 'Enhance/Improve <sth>'
+labels: 'Feature request'
+assignees: ''
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+### Describe problem
+
+A clear and concise description of what the problem is.
+
+### Describe the solution you'd like
 
-**Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+### Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+### List of tasks to be accomplished
+
+- [ ] Task 1
+- [ ] Task 2
+- [ ] TBD
+
+### Notes
+
 Add any other context or screenshots about the feature request here.
diff --git a/SemanticData/UANodeSetValidation/AddressSpaceContext.cs b/SemanticData/UANodeSetValidation/AddressSpaceContext.cs
index f5c5f893..4f9980c0 100644
--- a/SemanticData/UANodeSetValidation/AddressSpaceContext.cs
+++ b/SemanticData/UANodeSetValidation/AddressSpaceContext.cs
@@ -351,6 +351,7 @@ private void GetBaseTypes(IUANodeContext rootNode, List<IUANodeContext> inherita
       rootNode.InRecursionChain = false;
     }
 
+    //TODO Add a warning that the AS contains nodes orphaned and inaccessible for browsing starting from the Root node #529
     private void ValidateAndExportModel(int nameSpaceIndex, IValidator validator)
     {
       IEnumerable<IUANodeContext> _stubs = from _key in m_NodesDictionary.Values where _key.NodeIdContext.NamespaceIndex == nameSpaceIndex select _key;