diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index 8a77114..ff6c13a 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -1243,7 +1243,7 @@ under the License.
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <!-- NOTE: Using sub-select here to use the result of SalesOrder view while joining it with OrderItem -->
         <!-- TODO sub-select is used here, but needs to be revisted for query performance and efficiency -->
-        <member-entity entity-alias="SOV" entity-name="co.hotwax.financial.SalesOrderView" sub-select="true" join-from-alias="OI">
+        <member-entity entity-alias="SOV" entity-name="co.hotwax.financial.SalesOrderView" sub-select="non-lateral" join-from-alias="OI">
             <key-map field-name="orderId"/>
             <key-map field-name="orderItemSeqId"/>
         </member-entity>
@@ -1425,7 +1425,7 @@ under the License.
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <!-- NOTE: Using sub-select here to use the result of SalesOrder view while joining it with OrderItem -->
         <!-- TODO sub-select is used here, but needs to be revisted for query performance and efficiency -->
-        <member-entity entity-alias="OISD" entity-name="co.hotwax.warehouse.OrderItemShipmentDetail" sub-select="true" join-from-alias="OI">
+        <member-entity entity-alias="OISD" entity-name="co.hotwax.warehouse.OrderItemShipmentDetail" sub-select="non-lateral" join-from-alias="OI">
             <key-map field-name="orderId"/>
             <key-map field-name="orderItemSeqId"/>
         </member-entity>
@@ -1461,7 +1461,7 @@ under the License.
     <view-entity entity-name="FulfilledOrdersItemsForShopify" package="co.hotwax.warehouse">
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <!-- TODO sub-select is used here, but needs to be revisted for query performance and efficiency -->
-        <member-entity entity-alias="SOV" entity-name="co.hotwax.financial.SalesOrderView" sub-select="true" join-from-alias="OI">
+        <member-entity entity-alias="SOV" entity-name="co.hotwax.financial.SalesOrderView" sub-select="non-lateral" join-from-alias="OI">
             <key-map field-name="orderItemSeqId"/>
             <key-map field-name="orderId"/>
         </member-entity>
@@ -1495,7 +1495,7 @@ under the License.
     <view-entity entity-name="OrderItemShipmentForShopify" package="co.hotwax.warehouse">
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <!-- TODO sub-select is used here, but needs to be revisted for query performance and efficiency -->
-        <member-entity entity-alias="OISD" entity-name="co.hotwax.warehouse.OrderItemShipmentDetail" sub-select="true" join-from-alias="OI">
+        <member-entity entity-alias="OISD" entity-name="co.hotwax.warehouse.OrderItemShipmentDetail" sub-select="non-lateral" join-from-alias="OI">
             <key-map field-name="orderId"/>
             <key-map field-name="orderItemSeqId"/>
         </member-entity>
diff --git a/entity/OmsShopifyViewEntities.xml b/entity/OmsShopifyViewEntities.xml
index 4b63e6d..d728a07 100644
--- a/entity/OmsShopifyViewEntities.xml
+++ b/entity/OmsShopifyViewEntities.xml
@@ -107,13 +107,13 @@ under the License.
 
     <!-- Note: This view is created as we need to get the products associated with correct Product Stores and Facilities.
         To join with ProductStoreFacility we need to map productStoreId and facilityId both, it was not possible in ShopifyProductInventory view
-        as no member entity had both productStoreId and facilityId. Hence in this view we use the ShopifyProductInventory view as member entity with sub-select=true,
+        as no member entity had both productStoreId and facilityId. Hence in this view we use the ShopifyProductInventory view as member entity with sub-select="non-lateral",
         this allows us to join the ProductStoreFacility with the result of ShopifyProductInventory on productStoreId and facilityId fields. -->
     <view-entity entity-name="ProductStoreFacilityAndShopifyInventory" package="co.hotwax.shopify">
         <description>View entity to get Products associated with the respective facilities of a Product Store</description>
         <member-entity entity-alias="PSF" entity-name="org.apache.ofbiz.product.store.ProductStoreFacility"/>
         <!-- NOTE: Using sub-select here to use the result of ShopifyProductInventory view while joining it with ProductStoreFacility -->
-        <member-entity entity-alias="SPI" entity-name="co.hotwax.shopify.ShopifyProductInventory" join-from-alias="PSF" sub-select="true">
+        <member-entity entity-alias="SPI" entity-name="co.hotwax.shopify.ShopifyProductInventory" join-from-alias="PSF" sub-select="non-lateral">
             <key-map field-name="facilityId"/>
             <key-map field-name="productStoreId"/>
         </member-entity>