diff --git a/Controls/CheckBoxList/CheckBoxList/ControlManifest.Input.xml b/Controls/CheckBoxList/CheckBoxList/ControlManifest.Input.xml
index 836c85f..4787a33 100644
--- a/Controls/CheckBoxList/CheckBoxList/ControlManifest.Input.xml
+++ b/Controls/CheckBoxList/CheckBoxList/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-116" ?>
 <manifest>
-  <control namespace="ItAintBoring.PCFControls" constructor="CheckBoxList" version="0.0.250" display-name-key="CheckBox List" description-key="CheckBox List" control-type="standard">
+  <control namespace="ItAintBoring.PCFControls" constructor="CheckBoxList" version="0.0.252" display-name-key="CheckBox List" description-key="CheckBox List" control-type="standard">
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <data-set name="tableGrid" display-name-key="Table Grid" >
 	<!--cds-data-set-options="displayIndex:true;displayCommandBar:true;displayViewSelector:false;displayQuickFind:false"-->
diff --git a/Controls/Deployment/Solutions/ItAintBoringPCFControls.zip b/Controls/Deployment/Solutions/ItAintBoringPCFControls.zip
index 5a5d1f2..67c1b78 100644
Binary files a/Controls/Deployment/Solutions/ItAintBoringPCFControls.zip and b/Controls/Deployment/Solutions/ItAintBoringPCFControls.zip differ
diff --git a/Controls/NToNMultiSelect/NToNMultiSelect/ControlManifest.Input.xml b/Controls/NToNMultiSelect/NToNMultiSelect/ControlManifest.Input.xml
index 9196576..8a1c54d 100644
--- a/Controls/NToNMultiSelect/NToNMultiSelect/ControlManifest.Input.xml
+++ b/Controls/NToNMultiSelect/NToNMultiSelect/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-37" ?>
+<?xml version="1.0" encoding="utf-39" ?>
 <manifest>
-  <control namespace="ItAintBoring.PCFControls" constructor="NToNMultiSelect" version="0.0.37" display-name-key="NToNMultiSelect" description-key="NToNMultiSelect description" control-type="standard">
+  <control namespace="ItAintBoring.PCFControls" constructor="NToNMultiSelect" version="0.0.39" display-name-key="NToNMultiSelect" description-key="NToNMultiSelect description" control-type="standard">
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <property name="value" display-name-key="Value" description-key="Value" of-type="SingleLine.Text" usage="bound" required="true" />
     <property name="linkedEntityName" display-name-key="Linked Entity Name" description-key="Linked Entity Name" of-type="SingleLine.Text" usage="input" required="false" />
@@ -24,10 +24,10 @@
       <property name="sampleProperty" display-name-key="Property_Display_Key" description-key="Property_Desc_Key" of-type-group="numbers" usage="bound" required="true" />
     -->
     <resources>
-      <code path="index.ts" order="37"/>
-	  <css path="css/select2.min.css" order="37" />
+      <code path="index.ts" order="39"/>
+	  <css path="css/select2.min.css" order="39" />
       <!-- UNCOMMENT TO ADD MORE RESOURCES
-      <css path="css/NToNMultiSelect.css" order="37" />
+      <css path="css/NToNMultiSelect.css" order="39" />
       <resx path="strings/NToNMultiSelect.1033.resx" version="1.0.0" />
       -->
     </resources>
diff --git a/Controls/NToNMultiSelect/NToNMultiSelect/index.ts b/Controls/NToNMultiSelect/NToNMultiSelect/index.ts
index 7bc14a7..12d745c 100644
--- a/Controls/NToNMultiSelect/NToNMultiSelect/index.ts
+++ b/Controls/NToNMultiSelect/NToNMultiSelect/index.ts
@@ -129,7 +129,8 @@ export class NToNMultiSelect implements ComponentFramework.StandardControl<IInpu
 		(<any>Xrm).Utility.getEntityMetadata(this._linkedEntityName,[]).then(this._linkedEntityMetadataSuccessCallback, this.errorCallback);
 		//(<any>Xrm).WebApi.retrieveMultipleRecords(this._relationshipEntity, "?$filter="+ (<any>this.contextObj).page.entityTypeName+"id eq " + (<any>this.contextObj).page.entityId, 5000).then(this._relationshipSuccessCallback, this.errorCallback);
 		
-		if((<any>this.contextObj).page.entityId != null)
+		if((<any>this.contextObj).page.entityId != null 
+		   && (<any>this.contextObj).page.entityId != "00000000-0000-0000-0000-000000000000")
 		{
   	  	    this.contextObj.webAPI.retrieveMultipleRecords(this._relationshipEntity, "?$filter="+ (<any>this.contextObj).page.entityTypeName+"id eq " + (<any>this.contextObj).page.entityId, 5000).then(this._relationshipSuccessCallback, this.errorCallback);
 		}
@@ -253,7 +254,8 @@ export class NToNMultiSelect implements ComponentFramework.StandardControl<IInpu
 				}
 		*/
 
-		if((<any>this.contextObj).page.entityId == null)
+		if((<any>this.contextObj).page.entityId == null
+		   || (<any>this.contextObj).page.entityId == "00000000-0000-0000-0000-000000000000")
 		{
 			if(action == "select")
 			{
diff --git a/Controls/TreeRelationships/TreeRelationships/ControlManifest.Input.xml b/Controls/TreeRelationships/TreeRelationships/ControlManifest.Input.xml
index bff5464..aeb014f 100644
--- a/Controls/TreeRelationships/TreeRelationships/ControlManifest.Input.xml
+++ b/Controls/TreeRelationships/TreeRelationships/ControlManifest.Input.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-62" ?>
 <manifest>
 
-  <control namespace="ItAintBoring.PCFControls" constructor="TreeRelationships" version="0.0.215" display-name-key="Tree Relationships" description-key="Tree Relationships" control-type="standard">
+  <control namespace="ItAintBoring.PCFControls" constructor="TreeRelationships" version="0.0.217" display-name-key="Tree Relationships" description-key="Tree Relationships" control-type="standard">
 
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
 	<data-set name="tableGrid" display-name-key="Table Grid" />
diff --git a/Controls/ValidatedInputControl/ValidatedInputControl/ControlManifest.Input.xml b/Controls/ValidatedInputControl/ValidatedInputControl/ControlManifest.Input.xml
index bb17378..48fe554 100644
--- a/Controls/ValidatedInputControl/ValidatedInputControl/ControlManifest.Input.xml
+++ b/Controls/ValidatedInputControl/ValidatedInputControl/ControlManifest.Input.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest>
 
-  <control namespace="ItAintBoring.PCFControls" constructor="ValidatedInputControl" version="0.0.264" display-name-key="Validated Input Control" description-key="Validated Input Control" control-type="standard">
+  <control namespace="ItAintBoring.PCFControls" constructor="ValidatedInputControl" version="0.0.266" display-name-key="Validated Input Control" description-key="Validated Input Control" control-type="standard">
 
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <property name="value" display-name-key="Value" description-key="Value" of-type="SingleLine.Text" usage="bound" required="true" />