diff --git a/catalog-rest-service/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/catalog-rest-service/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
index 3b48110b931..fe1c8f38ebd 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
@@ -516,12 +516,8 @@ const EntityTable = ({
                                     />
                                   </button>
                                 ) : (
-                                  <span className="tw-opacity-0 group-hover:tw-opacity-100">
-                                    <Tags
-                                      className="tw-border-main"
-                                      tag="+ Add tag"
-                                      type="outlined"
-                                    />
+                                  <span className="tw-opacity-60 group-hover:tw-opacity-100 tw-text-grey-muted group-hover:tw-text-primary">
+                                    <Tags tag="+ Add tag" type="outlined" />
                                   </span>
                                 )
                               ) : null}
@@ -567,7 +563,7 @@ const EntityTable = ({
                           </div>
                           {checkIfJoinsAvailable(row.original.name) && (
                             <div className="tw-mt-3">
-                              <span className="tw-text-gray-400 tw-mr-1">
+                              <span className="tw-text-grey-muted tw-mr-1">
                                 Frequently joined columns:
                               </span>
                               <span>
diff --git a/catalog-rest-service/src/main/resources/ui/src/pages/services/index.tsx b/catalog-rest-service/src/main/resources/ui/src/pages/services/index.tsx
index da106e9872e..badd774cd0b 100644
--- a/catalog-rest-service/src/main/resources/ui/src/pages/services/index.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/pages/services/index.tsx
@@ -394,7 +394,11 @@ const ServicesPage = () => {
             value: service.collection.name,
           };
         });
-        setIsLoading(false);
+        // Removed "setIsLoading(false)" from here,
+        // If there are service categories available
+        // Loader should wait for each category to fetch list of services
+        // Then only it should stop Loading and show available data or No data template
+        // This is handled in "updateServiceList" method
       } else {
         setIsLoading(false);
       }
@@ -423,7 +427,7 @@ const ServicesPage = () => {
             </div>
             <div className="tw-flex">
               <div className="tw-w-4/12">
-                {searchText || serviceList.length > 10 ? (
+                {searchText || serviceList.length > 0 ? (
                   <Searchbar
                     placeholder={`Search for ${servicesDisplayName[serviceName]}...`}
                     searchValue={searchText}