diff --git a/api/http/handler/endpoints/endpoint_list.go b/api/http/handler/endpoints/endpoint_list.go
index d0c2ee045..2d3ba7228 100644
--- a/api/http/handler/endpoints/endpoint_list.go
+++ b/api/http/handler/endpoints/endpoint_list.go
@@ -90,7 +90,7 @@ func (handler *Handler) endpointList(w http.ResponseWriter, r *http.Request) *ht
 	}
 
 	edgeDeviceFilter, _ := request.RetrieveBooleanQueryParameter(r, "edgeDeviceFilter", true)
-	filteredEndpoints = filterEndpointsByEdgeDeviceFilter(filteredEndpoints, edgeDeviceFilter)
+	filteredEndpoints = filterEndpointsByEdgeDevice(filteredEndpoints, edgeDeviceFilter)
 
 	if search != "" {
 		tags, err := handler.DataStore.Tag().Tags()
@@ -234,7 +234,7 @@ func filterEndpointsByTypes(endpoints []portainer.Endpoint, endpointTypes []int)
 	return filteredEndpoints
 }
 
-func filterEndpointsByEdgeDeviceFilter(endpoints []portainer.Endpoint, edgeDeviceFilter bool) []portainer.Endpoint {
+func filterEndpointsByEdgeDevice(endpoints []portainer.Endpoint, edgeDeviceFilter bool) []portainer.Endpoint {
 	filteredEndpoints := make([]portainer.Endpoint, 0)
 
 	for _, endpoint := range endpoints {
diff --git a/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx b/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
index de0c06e1d..522192edb 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
@@ -1,4 +1,5 @@
 import { useTable, usePagination } from 'react-table';
+
 import {
   Table,
   TableContainer,
@@ -8,7 +9,6 @@ import {
 import { Checkbox } from '@/portainer/components/form-components/Checkbox';
 import { Device } from '@/portainer/hostmanagement/open-amt/model';
 import { useEnvironment } from '@/portainer/environments/useEnvironment';
-
 import { useAMTDevices } from '@/edge/devices/components/AMTDevicesDatatable/useAMTDevices';
 import { RowProvider } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
index 447465878..3a2ca64bb 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
@@ -1,13 +1,13 @@
 import { CellProps, Column, TableInstance } from 'react-table';
 import { useRouter } from '@uirouter/react';
-import { Device } from '@/portainer/hostmanagement/open-amt/model';
 import { MenuItem } from '@reach/menu-button';
+
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
 import { ActionsMenu } from '@/portainer/components/datatables/components/ActionsMenu';
 import { confirm } from '@/portainer/services/modal.service/confirm';
 import { useEnvironment } from '@/portainer/environments/useEnvironment';
 import { executeDeviceAction } from '@/portainer/hostmanagement/open-amt/open-amt.service';
 import * as notifications from '@/portainer/services/notifications';
-
 import { useRowContext } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
 export const actions: Column<Device> = {
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
index f61bd3529..020cbb1ac 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
@@ -1,4 +1,5 @@
 import { Column } from 'react-table';
+
 import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
 export const hostname: Column<Device> = {
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
index 5ee7a88df..a104d4b1b 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
@@ -1,7 +1,7 @@
 import { CellProps, Column, TableInstance } from 'react-table';
 import clsx from 'clsx';
-import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
 import { useRowContext } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
 import styles from '../AMTDevices.module.css';
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
index 891ac5e72..156f9e12b 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
@@ -1,5 +1,6 @@
 import { CellProps, Column, TableInstance } from 'react-table';
 import clsx from 'clsx';
+
 import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
 export const status: Column<Device> = {
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
index a32586c87..48ab69df3 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
@@ -8,6 +8,7 @@ import {
   usePagination,
 } from 'react-table';
 import { useRowSelectColumn } from '@lineup-lite/hooks';
+
 import { Environment } from '@/portainer/environments/types';
 import { PaginationControls } from '@/portainer/components/pagination-controls';
 import {
@@ -33,7 +34,6 @@ import { useRowSelect } from '@/portainer/components/datatables/components/useRo
 import { TableFooter } from '@/portainer/components/datatables/components/TableFooter';
 import { SelectedRowsCount } from '@/portainer/components/datatables/components/SelectedRowsCount';
 import { EnvironmentProvider } from '@/portainer/environments/useEnvironment';
-
 import { EdgeDeviceTableSettings } from '@/edge/devices/types';
 import { EdgeDevicesDatatableSettings } from '@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings';
 import { EdgeDevicesDatatableActions } from '@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableActions';
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
index 2fff8dbeb..b9c549768 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
@@ -1,8 +1,7 @@
+import { react2angular } from '@/react-tools/react2angular';
 import { TableSettingsProvider } from '@/portainer/components/datatables/components/useTableSettings';
 import { SearchBarProvider } from '@/portainer/components/datatables/components/SearchBar';
 
-import { react2angular } from '@/react-tools/react2angular';
-
 import {
   EdgeDevicesDatatable,
   EdgeDevicesTableProps,
diff --git a/app/portainer/components/datatables/components/ActionsMenu.tsx b/app/portainer/components/datatables/components/ActionsMenu.tsx
index 71bd77ea7..6042211d0 100644
--- a/app/portainer/components/datatables/components/ActionsMenu.tsx
+++ b/app/portainer/components/datatables/components/ActionsMenu.tsx
@@ -1,28 +1,29 @@
-import {Menu, MenuList, MenuButton} from "@reach/menu-button";
-import clsx from "clsx";
-import {ReactNode} from "react";
+import { ReactNode } from 'react';
+import clsx from 'clsx';
+import { Menu, MenuList, MenuButton } from '@reach/menu-button';
 
-import styles from './ActionsMenu.module.css'
+import styles from './ActionsMenu.module.css';
 
 interface Props {
-    children: ReactNode;
+  children: ReactNode;
 }
 
 export function ActionsMenu({ children }: Props) {
   return (
-      <Menu className={styles.actions}>
-        {({ isExpanded }) => (
-            <>
-              <MenuButton
-                  className={clsx(styles.tableActionsMenuBtn, isExpanded && styles.actionsActive)}
-              >
-                <i className="fa fa-ellipsis-v" aria-hidden="true" />
-              </MenuButton>
-              <MenuList>
-                  {children}
-              </MenuList>
-            </>
-        )}
-      </Menu>
-  )
+    <Menu className={styles.actions}>
+      {({ isExpanded }) => (
+        <>
+          <MenuButton
+            className={clsx(
+              styles.tableActionsMenuBtn,
+              isExpanded && styles.actionsActive
+            )}
+          >
+            <i className="fa fa-ellipsis-v" aria-hidden="true" />
+          </MenuButton>
+          <MenuList>{children}</MenuList>
+        </>
+      )}
+    </Menu>
+  );
 }