diff --git a/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs b/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
index 00254c8..cf9e040 100644
--- a/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
+++ b/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
@@ -157,7 +157,7 @@ public static string GetAttributeCode(this CrmPluginRegistrationAttribute attrib
                 additionalParmeters += indentation + ",Id = \"" + attribute.Id + "\"";
 
             if (attribute.ExecutionMode == ExecutionModeEnum.Asynchronous && attribute.DeleteAsyncOperation == true)
-                additionalParmeters += indentation + ",DeleteAsyncOperation = " + attribute.DeleteAsyncOperation;
+                additionalParmeters += indentation + ",DeleteAsyncOperation = " + attribute.DeleteAsyncOperation.ToString().ToLower();
 
             if (attribute.UnSecureConfiguration != null)
                 additionalParmeters += indentation + ",UnSecureConfiguration = @\"" + attribute.UnSecureConfiguration.Replace("\"","\"\"") + "\"";
diff --git a/spkl/SparkleXrm.Tasks/Tasks/Queries.cs b/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
index f846afc..140e03a 100644
--- a/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
+++ b/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
@@ -31,6 +31,7 @@ on s.SdkMessageId.Id equals m.SdkMessageId
                         SdkMessageFilterId = s.SdkMessageFilterId,
                         Configuration = s.Configuration,
                         Description = s.Description,
+                        AsyncAutoDelete = s.AsyncAutoDelete,
                         sdkmessageid_sdkmessageprocessingstep = new SdkMessage
                         {
                             SdkMessageId = m.SdkMessageId,