diff --git a/README.md b/README.md
index 7f7c9fb..7effd73 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ description: Microsoft Teams bot and messaging extension to search & report inci
 urlFragment: microsoft-teams-apps-incidentreport
 ---
 
+# Incident Reporter App Template
+
 | [Documentation](https://github.com/OfficeDev/microsoft-teams-apps-incidentreport/wiki/Home) | [Deployment guide](https://github.com/OfficeDev/microsoft-teams-apps-incidentreport/wiki/Deployment-Guide) | [Architecture](https://github.com/OfficeDev/microsoft-teams-apps-incidentreport/wiki/Solution-Overview) |
 | ---- | ---- | ---- |
 
@@ -22,7 +24,7 @@ The Incident Reporter bot in Microsoft Teams, helps you to easily and quickly re
 
 ![Messaging extension for experts](https://github.com/OfficeDev/microsoft-teams-apps-incidentreport/wiki/Images/Message-extensions.jpg)
 
-## Legal Notice
+## Legal notice
 Please read the license terms applicable to this app template [here](https://github.com/OfficeDev/microsoft-teams-apps-incidentreport/blob/master/LICENSE). In addition to these terms, by using this app template you agree to the following:
 
 * You are responsible for complying with applicable privacy and security regulations related to use, collection and handling of any personal data by your app.  This includes complying with all internal privacy and security policies of your organization if your app is developed to be sideloaded internally within your organization.
diff --git a/Source/Microsoft.Teams.Apps.RemoteSupport.Common/Providers/TicketSearchService.cs b/Source/Microsoft.Teams.Apps.RemoteSupport.Common/Providers/TicketSearchService.cs
index 104dc58..8153e17 100644
--- a/Source/Microsoft.Teams.Apps.RemoteSupport.Common/Providers/TicketSearchService.cs
+++ b/Source/Microsoft.Teams.Apps.RemoteSupport.Common/Providers/TicketSearchService.cs
@@ -98,12 +98,12 @@ public async Task<IList<TicketDetail>> SearchTicketsAsync(TicketSearchScope sear
                     break;
 
                 case TicketSearchScope.AssignedTickets:
-                    searchParameters.Filter = $"TicketStatus eq {(int)TicketState.Assigned} and AssignedToName ne null";
+                    searchParameters.Filter = $"TicketStatus eq {(int)TicketState.Assigned}";
                     searchParameters.OrderBy = new[] { "Timestamp desc" };
                     break;
 
                 case TicketSearchScope.UnassignedTickets:
-                    searchParameters.Filter = $"TicketStatus eq {(int)TicketState.Unassigned} and AssignedToName eq null";
+                    searchParameters.Filter = $"TicketStatus eq {(int)TicketState.Unassigned}";
                     searchParameters.OrderBy = new[] { "Timestamp desc" };
                     break;
                 case TicketSearchScope.ActiveTickets:
diff --git a/Source/Microsoft.Teams.Apps.RemoteSupport.Configuration/ClientApp/src/components/input-text-form.tsx b/Source/Microsoft.Teams.Apps.RemoteSupport.Configuration/ClientApp/src/components/input-text-form.tsx
index e5e5fb1..f8ec57e 100644
--- a/Source/Microsoft.Teams.Apps.RemoteSupport.Configuration/ClientApp/src/components/input-text-form.tsx
+++ b/Source/Microsoft.Teams.Apps.RemoteSupport.Configuration/ClientApp/src/components/input-text-form.tsx
@@ -31,7 +31,7 @@ const InputTextForm: React.FunctionComponent<IPropertiesProps> = (props) => {
                     <Input fluid placeholder={props.resourceStrings.placeholderText} value={properties.placeholder} onChange={(e: any) => { setProperties({ ...properties, placeholder: e.target.value }) }} />
                 </>
             </Flex.Item>
-            <Button content={props.resourceStrings.common.btnAddComponent} onClick={onAddComponent} />
+            <Button content={props.resourceStrings.btnAddComponent} onClick={onAddComponent} />
         </>
     );
 }
diff --git a/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/AppIcon.png b/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/AppIcon.png
new file mode 100644
index 0000000..d3de282
Binary files /dev/null and b/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/AppIcon.png differ
diff --git a/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/Urgent.png b/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/Urgent.png
new file mode 100644
index 0000000..bde5fca
Binary files /dev/null and b/Source/Microsoft.Teams.Apps.RemoteSupport/wwwroot/Artifacts/Urgent.png differ