diff --git a/lib/modules/alarm/alarms_base.dart b/lib/modules/alarm/alarms_base.dart
index 21e76ac..420efb6 100644
--- a/lib/modules/alarm/alarms_base.dart
+++ b/lib/modules/alarm/alarms_base.dart
@@ -61,7 +61,7 @@ mixin AlarmsBase on EntitiesBase<AlarmInfo, AlarmQuery> {
 
 class AlarmQueryController extends PageKeyController<AlarmQuery> {
 
-  AlarmQueryController({int pageSize = 10, String? searchText}) : super(AlarmQuery(TimePageLink(pageSize, 0, searchText, SortOrder('createdTime', Direction.DESC)), fetchOriginator: true));
+  AlarmQueryController({int pageSize = 20, String? searchText}) : super(AlarmQuery(TimePageLink(pageSize, 0, searchText, SortOrder('createdTime', Direction.DESC)), fetchOriginator: true));
 
   @override
   AlarmQuery nextPageKey(AlarmQuery pageKey) {
diff --git a/lib/modules/device/devices_base.dart b/lib/modules/device/devices_base.dart
index 88d6330..3074c2f 100644
--- a/lib/modules/device/devices_base.dart
+++ b/lib/modules/device/devices_base.dart
@@ -63,7 +63,7 @@ mixin DevicesBase on EntitiesBase<EntityData, EntityDataQuery> {
 
 class DeviceQueryController extends PageKeyController<EntityDataQuery> {
 
-  DeviceQueryController({int pageSize = 10, String? searchText, String? deviceType, bool? active}):
+  DeviceQueryController({int pageSize = 20, String? searchText, String? deviceType, bool? active}):
         super(EntityQueryApi.createDefaultDeviceQuery(pageSize: pageSize, searchText: searchText, deviceType: deviceType, active: active));
 
   @override
@@ -109,8 +109,12 @@ class _DeviceCardState extends TbContextState<DeviceCard, _DeviceCardState> {
   void didUpdateWidget(DeviceCard oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (widget.displayImage) {
-      deviceProfileFuture = DeviceProfileCache.getDeviceProfileInfo(
-          tbClient, widget.device.field('type')!, widget.device.entityId.id!);
+      var oldDevice = oldWidget.device;
+      var device = widget.device;
+      if (oldDevice.field('type')! != device.field('type')!) {
+        deviceProfileFuture = DeviceProfileCache.getDeviceProfileInfo(
+            tbClient, widget.device.field('type')!, widget.device.entityId.id!);
+      }
     }
   }