diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 650c0d21..0f565525 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -12,8 +12,8 @@ class DeviceSearchFilters extends StatefulWidget {
   State<DeviceSearchFilters> createState() => _DeviceSearchFiltersState();
 }
 
-class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperResponsiveLayout {
-  final TextEditingController communityController = TextEditingController();
+class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
+    with HelperResponsiveLayout {
   final TextEditingController unitNameController = TextEditingController();
   final TextEditingController productNameController = TextEditingController();
 
@@ -22,11 +22,17 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
     return isExtraLargeScreenSize(context)
         ? Row(
             children: [
-              _buildSearchField("Community", communityController, 200),
+              _buildSearchField(
+                "Space Name",
+                unitNameController,
+                200,
+              ),
               const SizedBox(width: 20),
-              _buildSearchField("Space Name", unitNameController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Device Name / Product Name", productNameController, 300),
+              _buildSearchField(
+                "Device Name / Product Name",
+                productNameController,
+                300,
+              ),
               const SizedBox(width: 20),
               _buildSearchResetButtons(),
             ],
@@ -36,11 +42,10 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
             runSpacing: 10,
             children: [
               _buildSearchField(
-                "Community",
-                communityController,
+                "Space Name",
+                unitNameController,
                 200,
               ),
-              _buildSearchField("Space Name", unitNameController, 200),
               _buildSearchField(
                 "Device Name / Product Name",
                 productNameController,
@@ -51,22 +56,25 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
           );
   }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
-    return Container(
-      child: StatefulTextField(
-        title: title,
-        width: width,
-        elevation: 2,
-        controller: controller,
-        onSubmitted: () {
-          context.read<DeviceManagementBloc>().add(SearchDevices(
-              productName: productNameController.text,
-              unitName: unitNameController.text,
-              community: communityController.text,
-              searchField: true));
-        },
-        onChanged: (p0) {},
-      ),
+  Widget _buildSearchField(
+    String title,
+    TextEditingController controller,
+    double width,
+  ) {
+    return StatefulTextField(
+      title: title,
+      width: width,
+      elevation: 2,
+      controller: controller,
+      onSubmitted: () {
+        final searchDevicesEvent = SearchDevices(
+          productName: productNameController.text,
+          unitName: unitNameController.text,
+          searchField: true,
+        );
+        context.read<DeviceManagementBloc>().add(searchDevicesEvent);
+      },
+      onChanged: (p0) {},
     );
   }
 
@@ -74,13 +82,11 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
     return SearchResetButtons(
       onSearch: () {
         context.read<DeviceManagementBloc>().add(SearchDevices(
-            community: communityController.text,
             unitName: unitNameController.text,
             productName: productNameController.text,
             searchField: true));
       },
       onReset: () {
-        communityController.clear();
         unitNameController.clear();
         productNameController.clear();
         context.read<DeviceManagementBloc>()