diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDeviceDetailsFilter.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDeviceDetailsFilter.js
index c45beea6..29220931 100644
--- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDeviceDetailsFilter.js
+++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDeviceDetailsFilter.js
@@ -50,8 +50,10 @@ function AdminDeviceDetailsFilter({ onApplyFilter, setErrorCode, setErrorMsg}) {
     
         // Check if fieldName is 'deviceType'
         if (fieldName === 'deviceType') {
+            //clear deviceSubType dropdown data
+            setDeviceSubTypeDropdownData([])
+            // return if no deviceType is selected
             if(selectedFilter === ""){
-                setDeviceSubTypeDropdownData([])
                 return;
             }
             try {
diff --git a/pmp-revamp-ui/src/pages/common/fields/TextInputComponent.js b/pmp-revamp-ui/src/pages/common/fields/TextInputComponent.js
index a3663540..0bfce599 100644
--- a/pmp-revamp-ui/src/pages/common/fields/TextInputComponent.js
+++ b/pmp-revamp-ui/src/pages/common/fields/TextInputComponent.js
@@ -11,7 +11,7 @@ function TextInputComponent({ fieldName, fieldNameKey, placeHolderKey, textBoxVa
     const handleInputChange = (event) => {
         const newValue = event.target.value;
         setInputValue(newValue);
-        onTextChange(fieldName, newValue);
+        onTextChange(fieldName, newValue.trim());
     };
 
     const onTextClear = () => {