diff --git a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/ControlManifest.Input.xml b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/ControlManifest.Input.xml
index 0ed2c35..8861ed1 100644
--- a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/ControlManifest.Input.xml
+++ b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest>
-  <control namespace="moeCAPS" constructor="AFGProjectsEditGridV2" version="0.0.7" display-name-key="AFGProjectsEditGridV2" description-key="AFGProjectsEditGridV2 description" control-type="standard" >
+  <control namespace="moeCAPS" constructor="AFGProjectsEditGridV2" version="0.0.8" display-name-key="AFGProjectsEditGridV2" description-key="AFGProjectsEditGridV2 description" control-type="standard" >
     <!--external-service-usage node declares whether this 3rd party PCF control is using external service or not, if yes, this control will be considered as premium and please also add the external domain it is using.
     If it is not using any external service, please set the enabled="false" and DO NOT add any domain below. The "enabled" will be false by default.
     Example1:
diff --git a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/index.ts b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/index.ts
index 6be4dae..2c46ffa 100644
--- a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/index.ts
+++ b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/AFGProjectsEditGridV2/index.ts
@@ -559,14 +559,14 @@ export class AFGProjectsEditGridV2 implements ComponentFramework.StandardControl
 					'<attribute name="' + valueField + '" />' +
 					'<attribute name="' + textField + '" />' +
 					'<order attribute="caps_type" />' +
+                    '<filter type="and" >' +
+                        '<condition attribute="statecode" operator="eq" value="0" />' +
+                    '</filter>' +
 					'<link-entity name="caps_submissioncategory" from="caps_submissioncategoryid" to="caps_submissioncategory" link-type="inner">' +
 						'<filter type="and" >' +
 							'<condition attribute="caps_categorycode" operator="eq" value="AFG" />' +
 						'</filter>' +
 					'</link-entity>' +
-                    '<filter type="and" >' +
-                        '<condition attribute="statecode" operator="eq" value="0" />' +
-                    '</filter>' +
 					'</entity>' +
 				'</fetch>';
 				break;
diff --git a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/Solution/src/Other/Solution.xml b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/Solution/src/Other/Solution.xml
index b1f3cdc..03c7c0d 100644
--- a/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/Solution/src/Other/Solution.xml
+++ b/CAPS/PowerAppComponentFramework/AFGProjectsEditGridPCF_v2/Solution/src/Other/Solution.xml
@@ -8,7 +8,7 @@
       <LocalizedName description="AFGProjectsEditGrid_V2" languagecode="1033" />
     </LocalizedNames>
     <Descriptions />
-    <Version>1.5</Version>
+    <Version>1.6</Version>
     <!-- Solution Package Type: Unmanaged(0)/Managed(1)/Both(2)-->
     <Managed>2</Managed>
     <Publisher>