diff --git a/firestore/README.md b/firestore/README.md
index 6edf0fd0..fe6b2f7b 100644
--- a/firestore/README.md
+++ b/firestore/README.md
@@ -48,6 +48,13 @@ service cloud.firestore {
   **Add Some** from the overflow menu to add some
   new entries.
 
+### Run the App Web
+
+Don't forget to run `flutterfire configure` to set up your app's FirebaseOptions
+
+In order to display images without a CORS exception, use the --web-renderer html flag:
+`flutter run -d chrome --web-renderer html`
+
 ### Result
 
 <img src="./assets/home.png" height="534" width="300"/>
diff --git a/firestore/android/build.gradle b/firestore/android/build.gradle
index 111a0724..5a4b0ce3 100644
--- a/firestore/android/build.gradle
+++ b/firestore/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         // START: FlutterFire Configuration
         classpath 'com.google.gms:google-services:4.3.10'
         // END: FlutterFire Configuration
@@ -29,6 +29,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/firestore/android/gradle/wrapper/gradle-wrapper.properties b/firestore/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58af..6b665338 100644
--- a/firestore/android/gradle/wrapper/gradle-wrapper.properties
+++ b/firestore/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/firestore/lib/firebase_options.dart b/firestore/lib/firebase_options.dart
index 0fdb1148..25918c07 100644
--- a/firestore/lib/firebase_options.dart
+++ b/firestore/lib/firebase_options.dart
@@ -3,6 +3,7 @@ import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
 /// Run 'flutterfire configure' to generate platform-specific FirebaseOptions.
 class DefaultFirebaseOptions {
   static FirebaseOptions get currentPlatform {
-    throw StateError("firebase_options.dart not generated. Did you run 'flutterfire configure'?");
+    throw StateError(
+        "firebase_options.dart not generated. Did you run 'flutterfire configure'?");
   }
 }
diff --git a/firestore/lib/src/data/restaurant_provider.dart b/firestore/lib/src/data/restaurant_provider.dart
index 19dbb94a..5a3d3388 100644
--- a/firestore/lib/src/data/restaurant_provider.dart
+++ b/firestore/lib/src/data/restaurant_provider.dart
@@ -18,7 +18,7 @@ import 'dart:async';
 
 import 'package:cloud_firestore/cloud_firestore.dart' hide Filter;
 
-import '../model/filter.dart';
+import '../model/filter.dart' as model_filter;
 import '../model/restaurant.dart';
 import '../model/review.dart';
 
@@ -29,7 +29,7 @@ abstract class RestaurantProvider {
       {required String restaurantId, required Review review});
   void addRestaurantsBatch(List<Restaurant> restaurants);
   void loadAllRestaurants();
-  void loadFilteredRestaurants(Filter filter);
+  void loadFilteredRestaurants(model_filter.Filter filter);
   Future<Restaurant> getRestaurantById(String restaurantId);
   void dispose();
 }
@@ -115,7 +115,7 @@ class FirestoreRestaurantProvider implements RestaurantProvider {
   }
 
   @override
-  void loadFilteredRestaurants(Filter filter) {
+  void loadFilteredRestaurants(model_filter.Filter filter) {
     Query collection = FirebaseFirestore.instance.collection('restaurants');
     if (filter.category != null) {
       collection = collection.where('category', isEqualTo: filter.category);
diff --git a/firestore/pubspec.lock b/firestore/pubspec.lock
index ed0a9185..c3170f99 100644
--- a/firestore/pubspec.lock
+++ b/firestore/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -265,18 +265,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -297,10 +297,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description: