diff --git a/lib/model/source/media_store_source.dart b/lib/model/source/media_store_source.dart
index a52e78b80..838ddd9e7 100644
--- a/lib/model/source/media_store_source.dart
+++ b/lib/model/source/media_store_source.dart
@@ -106,8 +106,7 @@ class MediaStoreSource extends CollectionSource {
   }
 
   Future<void> refreshUris(List<String> changedUris) async {
-    assert(_initialized);
-    debugPrint('$runtimeType refreshUris uris=$changedUris');
+    if (!_initialized) return;
 
     final uriByContentId = Map.fromEntries(changedUris.map((uri) {
       if (uri == null) return null;
diff --git a/lib/services/image_file_service.dart b/lib/services/image_file_service.dart
index 31a67829b..723d1312e 100644
--- a/lib/services/image_file_service.dart
+++ b/lib/services/image_file_service.dart
@@ -57,7 +57,6 @@ class ImageFileService {
   }
 
   static Future<AvesEntry> getEntry(String uri, String mimeType) async {
-    debugPrint('getEntry for uri=$uri, mimeType=$mimeType');
     try {
       final result = await platform.invokeMethod('getEntry', <String, dynamic>{
         'uri': uri,
diff --git a/lib/widgets/common/grid/sliver.dart b/lib/widgets/common/grid/sliver.dart
index 4c74a1688..85ba6b917 100644
--- a/lib/widgets/common/grid/sliver.dart
+++ b/lib/widgets/common/grid/sliver.dart
@@ -264,7 +264,7 @@ class _RenderSliverKnownExtentBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     final targetLastIndexForPaint = targetEndScrollOffsetForPaint.isFinite ? getMaxChildIndexForScrollOffset(targetEndScrollOffsetForPaint) : null;
     geometry = SliverGeometry(
       scrollExtent: estimatedMaxScrollOffset,
-      paintExtent: paintExtent,
+      paintExtent: math.min(paintExtent, estimatedMaxScrollOffset),
       cacheExtent: cacheExtent,
       maxPaintExtent: estimatedMaxScrollOffset,
       // Conservative to avoid flickering away the clip during scroll.
diff --git a/lib/widgets/search/expandable_filter_row.dart b/lib/widgets/search/expandable_filter_row.dart
index 5702fc9fb..a838d3901 100644
--- a/lib/widgets/search/expandable_filter_row.dart
+++ b/lib/widgets/search/expandable_filter_row.dart
@@ -105,7 +105,8 @@ class ExpandableFilterRow extends StatelessWidget {
 
   Widget _buildFilterChip(CollectionFilter filter) {
     return AvesFilterChip(
-      key: ValueKey(filter),
+      // key `album-...` is expected by test driver
+      key: Key(filter.key),
       filter: filter,
       heroType: heroTypeBuilder?.call(filter) ?? HeroType.onTap,
       onTap: onTap,