diff --git a/AdobeStockImageAdminUi/view/adminhtml/ui_component/adobe_stock_images_listing.xml b/AdobeStockImageAdminUi/view/adminhtml/ui_component/adobe_stock_images_listing.xml
index d07640ad5b8e..d5d1a52c3f04 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/ui_component/adobe_stock_images_listing.xml
+++ b/AdobeStockImageAdminUi/view/adminhtml/ui_component/adobe_stock_images_listing.xml
@@ -5,8 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
     <argument name="data" xsi:type="array">
         <item name="js_config" xsi:type="array">
             <item name="provider" xsi:type="string">adobe_stock_images_listing.adobe_stock_images_listing_data_source
@@ -27,8 +26,7 @@
             <updateUrl path="mui/index/render"/>
         </settings>
         <aclResource>Magento_AdobeStockImageAdminUi::save_preview_images</aclResource>
-        <dataProvider class="Magento\AdobeStockImageAdminUi\Model\Listing\DataProvider"
-                      name="adobe_stock_images_listing_data_source">
+        <dataProvider class="Magento\AdobeStockImageAdminUi\Model\Listing\DataProvider" name="adobe_stock_images_listing_data_source">
             <settings>
                 <requestFieldName>id</requestFieldName>
                 <primaryFieldName>id</primaryFieldName>
@@ -48,14 +46,14 @@
                 </sizesConfig>
             </settings>
         </paging>
-        <container name="sorting" component="Magento_AdobeStockImageAdminUi/js/components/sorting">
+	<container 
+		name="sorting" 
+		provider="adobe_stock_images_listing.adobe_stock_images_listing_data_source" 
+		displayArea="sorting" 
+		sortOrder="20" 
+		component="Magento_AdobeStockImageAdminUi/js/components/sorting">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="provider" xsi:type="string">
-                        adobe_stock_images_listing.adobe_stock_images_listing_data_source
-                    </item>
-                    <item name="displayArea" xsi:type="string">sorting</item>
-                    <item name="sortOrder" xsi:type="number">20</item>
                     <item name="deps" xsi:type="array">
                         <item name="0" xsi:type="string">
                             adobe_stock_images_listing.adobe_stock_images_listing.adobe_stock_images_columns
@@ -64,12 +62,7 @@
                 </item>
             </argument>
         </container>
-        <filters name="listing_filters">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="sortOrder" xsi:type="number">10</item>
-                </item>
-            </argument>
+        <filters name="listing_filters" sortOrder="10">
             <filterSelect name="content_type_filter" provider="${ $.parentName }" sortOrder="10">
                 <settings>
                     <caption translate="true">All</caption>
@@ -86,19 +79,21 @@
                     <dataScope>orientation_filter</dataScope>
                 </settings>
             </filterSelect>
-            <filterInput name="colors_filter" class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Color"
-                         template="Magento_AdobeStockImageAdminUi/grid/filter/color" provider="${ $.parentName }"
-                         sortOrder="30">
+	    <filterInput 
+		    name="colors_filter" 
+		    class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Color" 
+		    template="Magento_AdobeStockImageAdminUi/grid/filter/color" 
+		    provider="${ $.parentName }" 
+		    sortOrder="30"
+		    component="Magento_Ui/js/form/element/color-picker">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Color</item>
                         <item name="colorFormat" xsi:type="string">HEX</item>
-                        <item name="component" xsi:type="string">Magento_Ui/js/form/element/color-picker</item>
-                        <item name="dataScope" xsi:type="string">colors_filter</item>
-                        <item name="placeholder" xsi:type="string">HEX color</item>
                     </item>
                 </argument>
                 <settings>
+                    <dataScope>colors_filter</dataScope>
+                    <placeholder>HEX color</placeholder>
                     <label translate="true">Color</label>
                 </settings>
             </filterInput>
@@ -110,77 +105,67 @@
                     <dataScope>premium_price_filter</dataScope>
                 </settings>
             </filterSelect>
-            <filterInput name="offensive_filter"
-                         class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Checkbox"
-                         template="Magento_AdobeStockImageAdminUi/grid/filter/checkbox" provider="${ $.parentName }"
-                         sortOrder="50">
+	    <filterInput 
+		    name="offensive_filter" 
+		    class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Checkbox" 
+		    template="Magento_AdobeStockImageAdminUi/grid/filter/checkbox" 
+		    provider="${ $.parentName }" 
+		    sortOrder="50"
+		    component="Magento_Ui/js/form/element/single-checkbox">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Safe search</item>
                         <item name="description" xsi:type="string" translate="true">Disabled</item>
-                        <item name="component" xsi:type="string">Magento_Ui/js/form/element/single-checkbox</item>
-                        <item name="dataScope" xsi:type="string">offensive_filter</item>
                         <item name="valueMap" xsi:type="array">
                             <item name="true" xsi:type="string">Disabled</item>
                         </item>
                     </item>
                 </argument>
                 <settings>
+                    <dataScope>offensive_filter</dataScope>
                     <label translate="true">Safe search</label>
                 </settings>
             </filterInput>
-            <filterInput name="isolated_filter"
-                         class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Checkbox"
-                         template="Magento_AdobeStockImageAdminUi/grid/filter/checkbox" provider="${ $.parentName }"
-                         sortOrder="60">
+	    <filterInput 
+		    name="isolated_filter" 
+		    class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\Checkbox" 
+		    template="Magento_AdobeStockImageAdminUi/grid/filter/checkbox" 
+		    provider="${ $.parentName }" 
+		    sortOrder="60"
+		    component="Magento_Ui/js/form/element/single-checkbox">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Isolated Assets</item>
-                        <item name="additionalClasses" xsi:type="array">
-                            <item name="class" xsi:type="string">admin__isolated_filter</item>
-                        </item>
                         <item name="description" xsi:type="string" translate="true">Isolated Only</item>
-                        <item name="component" xsi:type="string">Magento_Ui/js/form/element/single-checkbox</item>
-                        <item name="dataScope" xsi:type="string">isolated_filter</item>
                         <item name="valueMap" xsi:type="array">
                             <item name="true" xsi:type="string">Isolated Only</item>
                         </item>
-                        <item name="tooltip" xsi:type="array">
-                            <item name="description" xsi:type="string" translate="true">Isolated assets have subjects
-                                appear alone on a solid background.
-                            </item>
-                        </item>
                     </item>
                 </argument>
                 <settings>
+                    <additionalClasses>
+                        <class name="admin__isolated_filter">true</class>
+                    </additionalClasses>
+                    <tooltip>
+                        <description>Isolated assets have subjects appear alone on a solid background.</description>
+                    </tooltip>
+                    <dataScope>isolated_filter</dataScope>
                     <label translate="true">Isolated Assets</label>
                 </settings>
             </filterInput>
-            <filterInput name="serie_id"
-                         class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\RelatedImages"
-                         provider="${ $.parentName }" sortOrder="70">
+            <filterInput name="serie_id" class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\RelatedImages" provider="${ $.parentName }" sortOrder="70">
                 <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Serie Id</item>
-                        <item name="visible" xsi:type="boolean">false</item>
-                        <item name="dataScope" xsi:type="string">serie_id</item>
-                    </item>
                 </argument>
                 <settings>
+                    <visible>false</visible>
+                    <dataScope>serie_id</dataScope>
                     <label translate="true">Serie Id</label>
                 </settings>
             </filterInput>
-            <filterInput name="model_id"
-                         class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\RelatedImages"
-                         provider="${ $.parentName }" sortOrder="80">
+            <filterInput name="model_id" class="\Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Filter\RelatedImages" provider="${ $.parentName }" sortOrder="80">
                 <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Model Id</item>
-                        <item name="visible" xsi:type="boolean">false</item>
-                        <item name="dataScope" xsi:type="string">model_id</item>
-                    </item>
                 </argument>
                 <settings>
+                    <visible>false</visible>
+                    <dataScope>model_id</dataScope>
                     <label translate="true">Model Id</label>
                 </settings>
             </filterInput>
@@ -192,8 +177,7 @@
                 <item name="containerId" xsi:type="string">adobe-stock-images-masonry-grid</item>
             </item>
         </argument>
-        <column name="overlay" component="Magento_AdobeUi/js/components/grid/column/overlay"
-                class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\LicensedOverlay">
+        <column name="overlay" component="Magento_AdobeUi/js/components/grid/column/overlay" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\LicensedOverlay">
             <settings>
                 <label translate="true">Overlay</label>
                 <bodyTmpl>Magento_AdobeUi/grid/column/overlay</bodyTmpl>
@@ -201,8 +185,7 @@
                 <sortable>false</sortable>
             </settings>
         </column>
-        <column name="thumbnail_url" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\Image"
-                component="Magento_AdobeUi/js/components/grid/column/image">
+        <column name="thumbnail_url" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\Image" component="Magento_AdobeUi/js/components/grid/column/image">
             <settings>
                 <label translate="true">Thumbnail Image</label>
                 <bodyTmpl>Magento_AdobeUi/grid/column/image</bodyTmpl>
@@ -210,8 +193,7 @@
                 <sortable>false</sortable>
             </settings>
         </column>
-        <column name="preview" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\ImagePreview"
-                component="Magento_AdobeStockImageAdminUi/js/components/grid/column/image-preview">
+        <column name="preview" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\ImagePreview" component="Magento_AdobeStockImageAdminUi/js/components/grid/column/image-preview">
             <settings>
                 <label translate="true">Image Preview</label>
                 <bodyTmpl>Magento_AdobeStockImageAdminUi/grid/column/image-preview</bodyTmpl>