diff --git a/CHANGELOG.md b/CHANGELOG.md
index d06669de3..d65bdca23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
-## <a id="v1.6.6"></a>[v1.6.6] - 2022-05-25
+## <a id="v1.6.7"></a>[v1.6.7] - 2022-05-25
 
 ### Added
 
@@ -27,6 +27,8 @@ All notable changes to this project will be documented in this file.
 - Android scrolling screenshot support
 - Voice Access scrolling support
 
+## <a id="v1.6.6"></a>[v1.6.6] - 2022-05-25 [YANKED AGAIN!]
+
 ## <a id="v1.6.5"></a>[v1.6.5] - 2022-05-25 [YANKED]
 
 ## <a id="v1.6.4"></a>[v1.6.4] - 2022-04-19
diff --git a/fastlane/metadata/android/en-US/changelogs/1073.txt b/fastlane/metadata/android/en-US/changelogs/1073.txt
new file mode 100644
index 000000000..75aa6e973
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1073.txt
@@ -0,0 +1,5 @@
+In v1.6.7:
+- bottom navigation bar
+- fast scroll with breadcrumbs
+- settings search
+Full changelog available on GitHub
diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart
index 7aea5e78c..d531a1438 100644
--- a/lib/widgets/collection/app_bar.dart
+++ b/lib/widgets/collection/app_bar.dart
@@ -203,8 +203,9 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
     final l10n = context.l10n;
 
     if (isSelecting) {
-      return Selector<Selection<AvesEntry>, int>(
-        selector: (context, selection) => selection.selectedItems.length,
+      // `Selection` may not be available during hero
+      return Selector<Selection<AvesEntry>?, int>(
+        selector: (context, selection) => selection?.selectedItems.length ?? 0,
         builder: (context, count, child) => Text(
           count == 0 ? l10n.collectionSelectPageTitle : l10n.itemCount(count),
           softWrap: false,
@@ -322,8 +323,9 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
     final onPressed = enabled ? () => _onActionSelected(action) : null;
     switch (action) {
       case EntrySetAction.toggleTitleSearch:
-        return Selector<Query, bool>(
-          selector: (context, query) => query.enabled,
+        // `Query` may not be available during hero
+        return Selector<Query?, bool>(
+          selector: (context, query) => query?.enabled ?? false,
           builder: (context, queryEnabled, child) {
             return _TitleSearchToggler(
               queryEnabled: queryEnabled,
diff --git a/lib/widgets/common/identity/aves_app_bar.dart b/lib/widgets/common/identity/aves_app_bar.dart
index 205fb521c..8dcadd5f0 100644
--- a/lib/widgets/common/identity/aves_app_bar.dart
+++ b/lib/widgets/common/identity/aves_app_bar.dart
@@ -2,7 +2,6 @@ import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/aves_app.dart';
 import 'package:aves/widgets/common/fx/blurred.dart';
-import 'package:aves/widgets/common/providers/query_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -101,26 +100,23 @@ class AvesAppBar extends StatelessWidget {
     final pushing = direction == HeroFlightDirection.push;
     Widget popBuilder(context, child) => Opacity(opacity: 1 - animation.value, child: child);
     Widget pushBuilder(context, child) => Opacity(opacity: animation.value, child: child);
-    return QueryProvider(
-      initialQuery: null,
-      child: Material(
-        type: MaterialType.transparency,
-        child: DefaultTextStyle(
-          style: DefaultTextStyle.of(toHero).style,
-          child: Stack(
-            children: [
-              AnimatedBuilder(
-                animation: animation,
-                builder: pushing ? popBuilder : pushBuilder,
-                child: fromHero.widget,
-              ),
-              AnimatedBuilder(
-                animation: animation,
-                builder: pushing ? pushBuilder : popBuilder,
-                child: toHero.widget,
-              ),
-            ],
-          ),
+    return Material(
+      type: MaterialType.transparency,
+      child: DefaultTextStyle(
+        style: DefaultTextStyle.of(toHero).style,
+        child: Stack(
+          children: [
+            AnimatedBuilder(
+              animation: animation,
+              builder: pushing ? popBuilder : pushBuilder,
+              child: fromHero.widget,
+            ),
+            AnimatedBuilder(
+              animation: animation,
+              builder: pushing ? pushBuilder : popBuilder,
+              child: toHero.widget,
+            ),
+          ],
         ),
       ),
     );
diff --git a/pubspec.yaml b/pubspec.yaml
index 7bc24ad3f..403fa8959 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ repository: https://github.com/deckerst/aves
 # - github changelog: /CHANGELOG.md
 # - play changelog:   /whatsnew/whatsnew-en-US
 # - izzy changelog:   /fastlane/metadata/android/en-US/changelogs/1XXX.txt
-version: 1.6.6+72
+version: 1.6.7+73
 publish_to: none
 
 environment:
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index 6c738d27d..5da320065 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1,4 +1,4 @@
-In v1.6.6:
+In v1.6.7:
 - bottom navigation bar
 - fast scroll with breadcrumbs
 - settings search