microsoft · pmasl · Jul 8, 2019 · Apr 30, 2019 · Jul 8, 2019 · Jul 8, 2019
diff --git a/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql b/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql
@@ -577,7 +577,11 @@ SELECT PolicyHistoryID
 	, EvaluatedServer
 	, EvaluationDateTime
 	, EvaluatedPolicy
-	, RIGHT(EvaluatedObject, CHARINDEX('\', REVERSE(EvaluatedObject)) - 1)	
+	, CASE WHEN CHARINDEX('\', REVERSE(EvaluatedObject)) >0 
+		THEN RIGHT(EvaluatedObject,CHARINDEX('\', REVERSE(EvaluatedObject)) - 1) 
+		ELSE EvaluatedObject 
+		END 
+	AS EvaluatedObject
 	, ExceptionMessage
 	, policy_id
 	, CategoryName

diff --git a/...e/sql-server-extended-security-updates/media/solutions-microsoft-logo-small.png b/...e/sql-server-extended-security-updates/media/solutions-microsoft-logo-small.png
diff --git a/samples/manage/sql-server-extended-security-updates/readme.md b/samples/manage/sql-server-extended-security-updates/readme.md
@@ -1,3 +1,5 @@
+![](./media/solutions-microsoft-logo-small.png)
+
 # SQL Server 2008/2008 R2 Extended Security Updates (ESUs)
 SQL Server 2008 and SQL Server 2008 R2 have reached the end of their support lifecycle on July 9, 2019. 
 Each version is backed by a minimum of 10 years of support (5 years for Mainstream Support and 5 years for Extended Support) including regular security updates. 
@@ -45,8 +47,7 @@ ESUs will be distributed if and when available, and do not include:
 ### Support
 ESUs do not include technical support, but customers can use an active support contract such as Software Assurance or Premier/Unified Support on SQL Server 2008 / 2008 R2 to get technical support on workloads covered by ESUs if they choose to stay on-premises. Alternatively, if hosting on Azure, customers can use an Azure Support plan to get technical support.
 
-> [!NOTE]   
-> Microsoft cannot provide technical support for SQL Server 2008 / 2008 R2 instances (both on-premises and in hosting environments) that are not covered with an ESU subscription.
+**Note**: Microsoft cannot provide technical support for SQL Server 2008 / 2008 R2 instances (both on-premises and in hosting environments) that are not covered with an ESU subscription.
 
 ### ESU Availability
 **In Azure:** Customers who migrate workloads to Azure Virtual Machines (IaaS) will have access to Extended Security Updates for SQL Server 2008 and 2008 R2 for three years after the End of Support dates for **no additional charges** above the cost of running the virtual machine. Customers do not need Software Assurance to receive Extended Security Updates in Azure.

diff --git a/samples/manage/sql-server-extended-security-updates/register.md b/samples/manage/sql-server-extended-security-updates/register.md
@@ -1,3 +1,5 @@
+![](./media/solutions-microsoft-logo-small.png)
+
 # Registering SQL Server instances for ESUs
 
 ## Table of Contents
@@ -9,8 +11,7 @@
 ## <a name="RegSingle"></a> Register a single SQL Server instance
 It's required that at least one SQL Server instance is registered in order to download an ESU package (if and when available). 
 
-> [!IMPORTANT]   
-> It's not required to register a SQL Server instance for ESUs when running an Azure Virtual Machine that is configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
+**Important**: It's not required to register a SQL Server instance for ESUs when running an Azure Virtual Machine that is configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
 
 ### Steps to register an instance
 1. To register a new SQL Server instance, click the ***+ Register*** button in the top bar.
@@ -62,8 +63,7 @@ It's required that at least one SQL Server instance is registered in order to do
 ## <a name="RegBulk"></a> Bulk register SQL Server instances 
 Bulk registering SQL Server instances to download an ESU package (if and when available) is done through uploading a CSV file. 
 
-> [!IMPORTANT]   
-> It's not required to register SQL Server instances for ESUs when running Azure Virtual Machines that are configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
+**Important**: It's not required to register SQL Server instances for ESUs when running Azure Virtual Machines that are configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
 
 Customers that already have an inventory application that holds the required registration information can generate a CSV file from that inventory, following the the [CSV formatting requirements](#csv) later in this page.
 
@@ -102,8 +102,7 @@ The CSV file **must** be generated with the following format:
 
 <sup>1</sup> Only for Azure Virtual Machine registrations
 
-> [!TIP]    
-> For example Powershell scripts that can generate the required SQL Server instance registration information into a CSV file, see [ESU registration script examples](scripts.md).
+**Tip**: For example Powershell scripts that can generate the required SQL Server instance registration information into a CSV file, see [ESU registration script examples](scripts.md).
 
 ### CSV Example 1 - on-premises
 
@@ -129,4 +128,4 @@ ServerUS2\SQL02,2008,Enterprise,8,Azure Virtual Machine,61868ab8-16d4-44ec-a9ff-
 SalesServer\SQLProdSales,2008 R2,Developer,8,Azure Virtual Machine,61868ab8-16d4-44ec-a9ff-f35d05922847,RG,VM3,2008 R2   
 ```
 
-Refer to [MyAzureVMs.csv](./scripts/MyAzureVMs.csv) for an Azure VM targetted CSV file example.
+Refer to [MyAzureVMs.csv](./scripts/MyAzureVMs.csv) for an Azure VM targetted CSV file example.
diff --git a/samples/manage/sql-server-extended-security-updates/registry.md b/samples/manage/sql-server-extended-security-updates/registry.md
@@ -1,14 +1,14 @@
+![](./media/solutions-microsoft-logo-small.png)
+
 # Create the SQL Server Registry
 Before being able access the Extended Security Updates (ESU) download area in the Azure portal, the SQL Server instances covered by ESUs must be registered. This ensures that you are able to download an ESU package if and when available.
 
-> [!IMPORTANT]   
-> It's not required to register a SQL Server instance for ESUs when running an Azure Virtual Machine that is configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
+**Important**: It's not required to register a SQL Server instance for ESUs when running an Azure Virtual Machine that is configured for Automatic Updates. For more information, see [Manage Windows updates by using Azure Automation](https://docs.microsoft.com/azure/automation/automation-tutorial-update-management).
 
 ## <a name="Reg"></a> Prepare to register SQL Server instances
 To register SQL Server instances, you must first create a SQL Server Registry in the [Azure portal](https://portal.azure.com). 
 
-> [!NOTE]   
-> This operation only needs to be done once. After a SQL Server Registry is created, it can be used to register multiple SQL Server instances.
+**Note**: This operation only needs to be done once. After a SQL Server Registry is created, it can be used to register multiple SQL Server instances.
 
 ### Steps
 1. Open the [Azure portal](https://portal.azure.com) and log in.
@@ -49,4 +49,4 @@ To register SQL Server instances, you must first create a SQL Server Registry in
 
     ![New Registry Step 9](./media/NewRegistry-Step9.png "New Registry Step 9") 
 
-    To start registering SQL Server instances, see [Registering SQL Server instances](./register.md).
+    To start registering SQL Server instances, see [Registering SQL Server instances](./register.md).
diff --git a/samples/manage/sql-server-extended-security-updates/scripts.md b/samples/manage/sql-server-extended-security-updates/scripts.md
@@ -1,3 +1,5 @@
+![](./media/solutions-microsoft-logo-small.png)
+
 #  ESU registration script examples
 
 Microsoft shares example scripts in [T-SQL](#tsql) and [Powershell](#ps) that can generate the required SQL Server instance registration information. The Powershell samples create a CSV file that can be used to bulk register SQL Server instances covered by an ESU subscription.
@@ -34,8 +36,7 @@ SELECT SERVERPROPERTY('ServerName') AS [name],
 	@Cores AS cores,
 	@HostType AS hostType;
 ```
-> [!NOTE]    
-> Verify if the **Host Type** is correct for your SQL Server instance.
+**Note**: Verify if the **Host Type** is correct for your SQL Server instance.
 
 ## <a name="ps"></a> Powershell
 
@@ -46,5 +47,4 @@ To collect registration information from **all instances in a single machine**,
 
 To collect registration information from **all instances listed in a text file**, you can use the example Powershell script [EOS_DataGenerator_InputList.ps1](./scripts/EOS_DataGenerator_InputList.ps1). Refer to [ServerInstances.txt](./scripts/ServerInstances.txt) for an input text file example.
 
-> [!NOTE]    
-> Verify if the **Host Type** is correct for your SQL Server instance before uploading the CSV file.
+**Note**: Verify if the **Host Type** is correct for your SQL Server instance before uploading the CSV file.