diff --git a/packages/fl_query/.flutter-plugins b/packages/fl_query/.flutter-plugins
index ae13581..84381da 100644
--- a/packages/fl_query/.flutter-plugins
+++ b/packages/fl_query/.flutter-plugins
@@ -1,6 +1,6 @@
 # This is a generated file; do not edit or check into version control.
-connectivity_plus=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
-connectivity_plus_linux=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
-connectivity_plus_macos=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/
-connectivity_plus_web=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
-connectivity_plus_windows=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
+connectivity_plus=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
+connectivity_plus_linux=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
+connectivity_plus_macos=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/
+connectivity_plus_web=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
+connectivity_plus_windows=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
diff --git a/packages/fl_query/.flutter-plugins-dependencies b/packages/fl_query/.flutter-plugins-dependencies
index e0ea478..1a7ddc9 100644
--- a/packages/fl_query/.flutter-plugins-dependencies
+++ b/packages/fl_query/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-10-12 22:11:02.991775","version":"3.3.4"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-12-14 11:46:10.170392","version":"3.3.8"}
\ No newline at end of file
diff --git a/packages/fl_query/example/.flutter-plugins b/packages/fl_query/example/.flutter-plugins
index 5cb254a..d393acb 100644
--- a/packages/fl_query/example/.flutter-plugins
+++ b/packages/fl_query/example/.flutter-plugins
@@ -1,6 +1,6 @@
 # This is a generated file; do not edit or check into version control.
-connectivity_plus=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
-connectivity_plus_linux=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
-connectivity_plus_macos=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/
-connectivity_plus_web=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
-connectivity_plus_windows=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
+connectivity_plus=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
+connectivity_plus_linux=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
+connectivity_plus_macos=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/
+connectivity_plus_web=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
+connectivity_plus_windows=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
diff --git a/packages/fl_query/example/.flutter-plugins-dependencies b/packages/fl_query/example/.flutter-plugins-dependencies
index ff3dcb1..bd33416 100644
--- a/packages/fl_query/example/.flutter-plugins-dependencies
+++ b/packages/fl_query/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-10-12 22:11:06.320813","version":"3.3.4"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-12-14 12:54:36.553871","version":"3.3.8"}
\ No newline at end of file
diff --git a/packages/fl_query/example/android/local.properties b/packages/fl_query/example/android/local.properties
index 561f207..46883a8 100644
--- a/packages/fl_query/example/android/local.properties
+++ b/packages/fl_query/example/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=/home/krtirtho/Android/Sdk
-flutter.sdk=/opt/flutter
+flutter.sdk=/home/krtirtho/fvm/versions/3.3.5
 flutter.buildMode=debug
 flutter.versionName=1.0.0
 flutter.versionCode=1
\ No newline at end of file
diff --git a/packages/fl_query/example/ios/Flutter/Generated.xcconfig b/packages/fl_query/example/ios/Flutter/Generated.xcconfig
index 70b558f..2ceb582 100644
--- a/packages/fl_query/example/ios/Flutter/Generated.xcconfig
+++ b/packages/fl_query/example/ios/Flutter/Generated.xcconfig
@@ -1,5 +1,5 @@
 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/opt/flutter
+FLUTTER_ROOT=/home/krtirtho/fvm/versions/3.3.5
 FLUTTER_APPLICATION_PATH=/home/krtirtho/dev/fl-query/packages/fl_query/example
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_TARGET=lib/main.dart
diff --git a/packages/fl_query/example/ios/Flutter/flutter_export_environment.sh b/packages/fl_query/example/ios/Flutter/flutter_export_environment.sh
index 9b97d92..7557696 100755
--- a/packages/fl_query/example/ios/Flutter/flutter_export_environment.sh
+++ b/packages/fl_query/example/ios/Flutter/flutter_export_environment.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/opt/flutter"
+export "FLUTTER_ROOT=/home/krtirtho/fvm/versions/3.3.5"
 export "FLUTTER_APPLICATION_PATH=/home/krtirtho/dev/fl-query/packages/fl_query/example"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
diff --git a/packages/fl_query/example/lib/components/query_external_data.dart b/packages/fl_query/example/lib/components/query_external_data.dart
index a433d71..d835835 100644
--- a/packages/fl_query/example/lib/components/query_external_data.dart
+++ b/packages/fl_query/example/lib/components/query_external_data.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 final jobWithExternalData = QueryJob<String, double>(
   queryKey: "query-external-data",
   cacheTime: const Duration(seconds: 10),
-  refetchOnExternalDataChange: false,
+  refetchOnExternalDataChange: true,
   task: (queryKey, data) {
     return Future.delayed(const Duration(milliseconds: 500),
         () => "Hello from $queryKey with $data");
diff --git a/packages/fl_query/example/linux/flutter/ephemeral/generated_config.cmake b/packages/fl_query/example/linux/flutter/ephemeral/generated_config.cmake
index 7b6158f..1ede13b 100644
--- a/packages/fl_query/example/linux/flutter/ephemeral/generated_config.cmake
+++ b/packages/fl_query/example/linux/flutter/ephemeral/generated_config.cmake
@@ -1,5 +1,5 @@
 # Generated code do not commit.
-file(TO_CMAKE_PATH "/opt/flutter" FLUTTER_ROOT)
+file(TO_CMAKE_PATH "/home/krtirtho/fvm/versions/3.3.5" FLUTTER_ROOT)
 file(TO_CMAKE_PATH "/home/krtirtho/dev/fl-query/packages/fl_query/example" PROJECT_DIR)
 
 set(FLUTTER_VERSION "1.0.0+1" PARENT_SCOPE)
@@ -10,7 +10,7 @@ set(FLUTTER_VERSION_BUILD 1 PARENT_SCOPE)
 
 # Environment variables to pass to tool_backend.sh
 list(APPEND FLUTTER_TOOL_ENVIRONMENT
-  "FLUTTER_ROOT=/opt/flutter"
+  "FLUTTER_ROOT=/home/krtirtho/fvm/versions/3.3.5"
   "PROJECT_DIR=/home/krtirtho/dev/fl-query/packages/fl_query/example"
   "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
   "DART_OBFUSCATION=false"
diff --git a/packages/fl_query/example/linux/flutter/ephemeral/libflutter_linux_gtk.so b/packages/fl_query/example/linux/flutter/ephemeral/libflutter_linux_gtk.so
index c0ea40c..2c78d56 100644
Binary files a/packages/fl_query/example/linux/flutter/ephemeral/libflutter_linux_gtk.so and b/packages/fl_query/example/linux/flutter/ephemeral/libflutter_linux_gtk.so differ
diff --git a/packages/fl_query/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/packages/fl_query/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
index d68231b..579fc56 100644
--- a/packages/fl_query/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
+++ b/packages/fl_query/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -1,5 +1,5 @@
 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/opt/flutter
+FLUTTER_ROOT=/home/krtirtho/fvm/versions/3.3.5
 FLUTTER_APPLICATION_PATH=/home/krtirtho/dev/fl-query/packages/fl_query/example
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
diff --git a/packages/fl_query/example/macos/Flutter/ephemeral/flutter_export_environment.sh b/packages/fl_query/example/macos/Flutter/ephemeral/flutter_export_environment.sh
index a486988..51e84e3 100755
--- a/packages/fl_query/example/macos/Flutter/ephemeral/flutter_export_environment.sh
+++ b/packages/fl_query/example/macos/Flutter/ephemeral/flutter_export_environment.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/opt/flutter"
+export "FLUTTER_ROOT=/home/krtirtho/fvm/versions/3.3.5"
 export "FLUTTER_APPLICATION_PATH=/home/krtirtho/dev/fl-query/packages/fl_query/example"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
diff --git a/packages/fl_query/lib/src/infinite_query_builder.dart b/packages/fl_query/lib/src/infinite_query_builder.dart
index 5c24a97..f78803a 100644
--- a/packages/fl_query/lib/src/infinite_query_builder.dart
+++ b/packages/fl_query/lib/src/infinite_query_builder.dart
@@ -58,18 +58,22 @@ class _InfiniteQueryBuilderState<T extends Object, Outside,
 
   void init([T? previousData]) async {
     final bowl = QueryBowl.of(context);
-
+    final prevInfiniteQuery =
+        bowl.getInfiniteQuery<T, Outside, PageParam>(widget.job.queryKey);
     infiniteQuery = bowl.addInfiniteQuery<T, Outside, PageParam>(
       widget.job,
       externalData: widget.externalData,
       key: uKey,
     );
-    final hasExternalDataChanged = infiniteQuery!.externalData != null &&
-        infiniteQuery!.prevUsedExternalData != null &&
-        !isShallowEqual(
-          infiniteQuery!.externalData!,
-          infiniteQuery!.prevUsedExternalData!,
-        );
+    final hasExternalDataChanged = prevInfiniteQuery != null
+        ? !isShallowEqual(
+            prevInfiniteQuery.externalData,
+            prevInfiniteQuery.prevUsedExternalData,
+          )
+        : !isShallowEqual(
+            infiniteQuery!.externalData,
+            infiniteQuery!.prevUsedExternalData,
+          );
 
     if (infiniteQuery!.fetched && hasExternalDataChanged) {
       await infiniteQuery!.refetchPages();
@@ -100,9 +104,7 @@ class _InfiniteQueryBuilderState<T extends Object, Outside,
       // } else {
       // init();
       // }
-    } else if (oldWidget.externalData != null &&
-        widget.externalData != null &&
-        !isShallowEqual(oldWidget.externalData!, widget.externalData!)) {
+    } else if (!isShallowEqual(oldWidget.externalData, widget.externalData)) {
       if (widget.job.refetchOnExternalDataChange ??
           queryBowl.refetchOnExternalDataChange) {
         QueryBowl.of(context).addInfiniteQuery(
diff --git a/packages/fl_query/lib/src/query_bowl.dart b/packages/fl_query/lib/src/query_bowl.dart
index 08742c9..d7421e6 100644
--- a/packages/fl_query/lib/src/query_bowl.dart
+++ b/packages/fl_query/lib/src/query_bowl.dart
@@ -383,12 +383,10 @@ class QueryBowl {
     if (prevQuery != null) {
       // run the query if its still not called or if externalData has
       // changed
-      if (prevQuery.prevUsedExternalData != null &&
-          externalData != null &&
-          !isShallowEqual(
-            prevQuery.prevUsedExternalData!,
-            externalData,
-          )) {
+      if (!isShallowEqual(
+        prevQuery.prevUsedExternalData,
+        externalData,
+      )) {
         prevQuery.setExternalData(externalData);
       }
       prevQuery.mount(key);
@@ -425,12 +423,10 @@ class QueryBowl {
     if (prevInfiniteQuery != null) {
       // run the query if its still not called or if externalData has
       // changed
-      if (prevInfiniteQuery.prevUsedExternalData != null &&
-          externalData != null &&
-          !isShallowEqual(
-            prevInfiniteQuery.prevUsedExternalData!,
-            externalData,
-          )) {
+      if (!isShallowEqual(
+        prevInfiniteQuery.prevUsedExternalData,
+        externalData,
+      )) {
         prevInfiniteQuery.setExternalData(externalData);
       }
       prevInfiniteQuery.mount(key);
@@ -499,12 +495,10 @@ class QueryBowl {
     if (prevQuery != null) {
       // run the query if its still not called or if externalData has
       // changed
-      final hasExternalDataChanged = prevQuery.prevUsedExternalData != null &&
-          externalData != null &&
-          !isShallowEqual(
-            prevQuery.prevUsedExternalData!,
-            externalData,
-          );
+      final hasExternalDataChanged = !isShallowEqual(
+        prevQuery.prevUsedExternalData,
+        externalData,
+      );
       prevQuery.mount(key);
       if (onData != null) prevQuery.addDataListener(onData);
       if (onError != null) prevQuery.addErrorListener(onError);
diff --git a/packages/fl_query/lib/src/query_builder.dart b/packages/fl_query/lib/src/query_builder.dart
index 54584ad..1144713 100644
--- a/packages/fl_query/lib/src/query_builder.dart
+++ b/packages/fl_query/lib/src/query_builder.dart
@@ -58,6 +58,7 @@ class _QueryBuilderState<T extends Object, Outside>
 
   void init([T? previousData]) async {
     final bowl = QueryBowl.of(context);
+    final prevQuery = bowl.getQuery<T, Outside>(widget.job.queryKey);
     query = bowl.addQuery<T, Outside>(
       widget.job,
       externalData: widget.externalData,
@@ -66,13 +67,15 @@ class _QueryBuilderState<T extends Object, Outside>
       onData: widget.onData,
       onError: widget.onError,
     );
-
-    final hasExternalDataChanged = query!.externalData != null &&
-        query!.prevUsedExternalData != null &&
-        !isShallowEqual(
-          query!.externalData!,
-          query!.prevUsedExternalData!,
-        );
+    final hasExternalDataChanged = prevQuery != null
+        ? !isShallowEqual(
+            prevQuery.externalData,
+            prevQuery.prevUsedExternalData,
+          )
+        : !isShallowEqual(
+            query!.externalData,
+            query!.prevUsedExternalData,
+          );
 
     if (query!.fetched && hasExternalDataChanged) {
       await query!.refetch();
@@ -103,9 +106,7 @@ class _QueryBuilderState<T extends Object, Outside>
       } else {
         init();
       }
-    } else if (oldWidget.externalData != null &&
-        widget.externalData != null &&
-        !isShallowEqual(oldWidget.externalData!, widget.externalData!)) {
+    } else if (!isShallowEqual(oldWidget.externalData, widget.externalData)) {
       if (widget.job.refetchOnExternalDataChange ??
           bowl.refetchOnExternalDataChange) {
         bowl.fetchQuery(
diff --git a/packages/fl_query/lib/src/utils.dart b/packages/fl_query/lib/src/utils.dart
index 7040982..f71bbf4 100644
--- a/packages/fl_query/lib/src/utils.dart
+++ b/packages/fl_query/lib/src/utils.dart
@@ -31,7 +31,10 @@ bool isShallowEqualMap(Map list1, Map list2) {
   });
 }
 
-bool isShallowEqual(Object obj1, Object obj2) {
+bool isShallowEqual(dynamic obj1, dynamic obj2) {
+  if (obj1 == null && obj2 == null) return true;
+  if ((obj1 == null && obj2 != null) || (obj2 == null && obj1 != null))
+    return false;
   if (obj1 is List && obj2 is List) {
     return isShallowEqualList(obj1, obj2);
   } else if (obj1 is Set && obj2 is Set) {
diff --git a/packages/fl_query_hooks/.flutter-plugins b/packages/fl_query_hooks/.flutter-plugins
index ae13581..84381da 100644
--- a/packages/fl_query_hooks/.flutter-plugins
+++ b/packages/fl_query_hooks/.flutter-plugins
@@ -1,6 +1,6 @@
 # This is a generated file; do not edit or check into version control.
-connectivity_plus=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
-connectivity_plus_linux=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
-connectivity_plus_macos=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/
-connectivity_plus_web=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
-connectivity_plus_windows=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
+connectivity_plus=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
+connectivity_plus_linux=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
+connectivity_plus_macos=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/
+connectivity_plus_web=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
+connectivity_plus_windows=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
diff --git a/packages/fl_query_hooks/.flutter-plugins-dependencies b/packages/fl_query_hooks/.flutter-plugins-dependencies
index d0b0749..62bad65 100644
--- a/packages/fl_query_hooks/.flutter-plugins-dependencies
+++ b/packages/fl_query_hooks/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-10-12 22:11:05.557834","version":"3.3.4"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-12-14 11:46:01.321906","version":"3.3.8"}
\ No newline at end of file
diff --git a/packages/fl_query_hooks/example/.flutter-plugins b/packages/fl_query_hooks/example/.flutter-plugins
index 5cb254a..d393acb 100644
--- a/packages/fl_query_hooks/example/.flutter-plugins
+++ b/packages/fl_query_hooks/example/.flutter-plugins
@@ -1,6 +1,6 @@
 # This is a generated file; do not edit or check into version control.
-connectivity_plus=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
-connectivity_plus_linux=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
-connectivity_plus_macos=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/
-connectivity_plus_web=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
-connectivity_plus_windows=/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
+connectivity_plus=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/
+connectivity_plus_linux=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/
+connectivity_plus_macos=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/
+connectivity_plus_web=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/
+connectivity_plus_windows=/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/
diff --git a/packages/fl_query_hooks/example/.flutter-plugins-dependencies b/packages/fl_query_hooks/example/.flutter-plugins-dependencies
index e00e04c..fffc13e 100644
--- a/packages/fl_query_hooks/example/.flutter-plugins-dependencies
+++ b/packages/fl_query_hooks/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/opt/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-10-12 22:11:08.760671","version":"3.3.4"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.3.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus_web","path":"/home/krtirtho/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]}],"date_created":"2022-12-14 11:46:05.508816","version":"3.3.8"}
\ No newline at end of file
diff --git a/packages/fl_query_hooks/lib/src/use_infinite_query.dart b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
index d6756fe..ad34286 100644
--- a/packages/fl_query_hooks/lib/src/use_infinite_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
@@ -42,6 +42,9 @@ InfiniteQuery<T, Outside, PageParam>
   final oldOnError = usePrevious(onError);
 
   final init = useCallback(([T? previousData]) {
+    final hasExternalDataChanged = !isShallowEqual(
+        infiniteQuery.value.externalData,
+        infiniteQuery.value.prevUsedExternalData);
     infiniteQuery.value = queryBowl.addInfiniteQuery<T, Outside, PageParam>(
       job,
       externalData: externalData,
@@ -50,10 +53,6 @@ InfiniteQuery<T, Outside, PageParam>
       onError: onError,
     );
     update();
-    final hasExternalDataChanged = infiniteQuery.value.externalData != null &&
-        infiniteQuery.value.prevUsedExternalData != null &&
-        !isShallowEqual(infiniteQuery.value.externalData!,
-            infiniteQuery.value.prevUsedExternalData!);
     if (infiniteQuery.value.fetched && hasExternalDataChanged) {
       infiniteQuery.value.refetchPages();
     } else if (!infiniteQuery.value.fetched) {
@@ -95,42 +94,42 @@ InfiniteQuery<T, Outside, PageParam>
   }, []);
 
   useEffect(() {
-    final hasOnErrorChanged = oldOnError != onError && oldOnError != null;
-    final hasOnDataChanged = oldOnData != onData && oldOnData != null;
-    if (oldJob != null && oldJob.queryKey != job.queryKey) {
-      disposeQuery();
-      init();
-    } else if (oldExternalData != null &&
-        externalData != null &&
-        !isShallowEqual(oldExternalData, externalData)) {
-      if (job.refetchOnExternalDataChange ??
-          queryBowl.refetchOnExternalDataChange) {
-        QueryBowl.of(context).addInfiniteQuery(
-          job,
-          externalData: externalData,
-          key: uKey,
-          onData: onData,
-          onError: onError,
-        )..refetchPages();
-      } else {
-        QueryBowl.of(context)
-            .getQuery(job.queryKey)
-            ?.setExternalData(externalData);
-      }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final hasOnErrorChanged = oldOnError != onError && oldOnError != null;
+      final hasOnDataChanged = oldOnData != onData && oldOnData != null;
+      if (oldJob != null && oldJob.queryKey != job.queryKey) {
+        disposeQuery();
+        init();
+      } else if (!isShallowEqual(oldExternalData, externalData)) {
+        if (job.refetchOnExternalDataChange ??
+            queryBowl.refetchOnExternalDataChange) {
+          QueryBowl.of(context).addInfiniteQuery(
+            job,
+            externalData: externalData,
+            key: uKey,
+            onData: onData,
+            onError: onError,
+          )..refetchPages();
+        } else {
+          QueryBowl.of(context)
+              .getQuery(job.queryKey)
+              ?.setExternalData(externalData);
+        }
 
-      if (hasOnDataChanged) infiniteQuery.value.removeDataListener(oldOnData);
-      if (hasOnErrorChanged)
-        infiniteQuery.value.removeErrorListener(oldOnError);
-    } else {
-      if (hasOnDataChanged) {
-        infiniteQuery.value.removeDataListener(oldOnData);
-        if (onData != null) infiniteQuery.value.addDataListener(onData);
+        if (hasOnDataChanged) infiniteQuery.value.removeDataListener(oldOnData);
+        if (hasOnErrorChanged)
+          infiniteQuery.value.removeErrorListener(oldOnError);
+      } else {
+        if (hasOnDataChanged) {
+          infiniteQuery.value.removeDataListener(oldOnData);
+          if (onData != null) infiniteQuery.value.addDataListener(onData);
+        }
+        if (hasOnErrorChanged) {
+          infiniteQuery.value.removeErrorListener(oldOnError);
+          if (onError != null) infiniteQuery.value.addErrorListener(onError);
+        }
       }
-      if (hasOnErrorChanged) {
-        infiniteQuery.value.removeErrorListener(oldOnError);
-        if (onError != null) infiniteQuery.value.addErrorListener(onError);
-      }
-    }
+    });
     return null;
   });
 
diff --git a/packages/fl_query_hooks/lib/src/use_mutation.dart b/packages/fl_query_hooks/lib/src/use_mutation.dart
index e614b3e..90becf3 100644
--- a/packages/fl_query_hooks/lib/src/use_mutation.dart
+++ b/packages/fl_query_hooks/lib/src/use_mutation.dart
@@ -75,23 +75,25 @@ Mutation<T, V> useMutation<T extends Object, V>({
   }, []);
 
   useEffect(() {
-    if (oldJob != null && oldJob.mutationKey != job.mutationKey) {
-      disposeMutation();
-      init();
-    } else {
-      if (oldOnData != onData && oldOnData != null) {
-        mutation.value.removeDataListener(oldOnData);
-        if (onData != null) mutation.value.addDataListener(onData);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (oldJob != null && oldJob.mutationKey != job.mutationKey) {
+        disposeMutation();
+        init();
+      } else {
+        if (oldOnData != onData && oldOnData != null) {
+          mutation.value.removeDataListener(oldOnData);
+          if (onData != null) mutation.value.addDataListener(onData);
+        }
+        if (oldOnError != onError && oldOnError != null) {
+          mutation.value.removeErrorListener(oldOnError);
+          if (onError != null) mutation.value.addErrorListener(onError);
+        }
+        if (oldOnMutate != onMutate && oldOnMutate != null) {
+          mutation.value.removeMutateListener(oldOnMutate);
+          if (onMutate != null) mutation.value.addMutateListener(onMutate);
+        }
       }
-      if (oldOnError != onError && oldOnError != null) {
-        mutation.value.removeErrorListener(oldOnError);
-        if (onError != null) mutation.value.addErrorListener(onError);
-      }
-      if (oldOnMutate != onMutate && oldOnMutate != null) {
-        mutation.value.removeMutateListener(oldOnMutate);
-        if (onMutate != null) mutation.value.addMutateListener(onMutate);
-      }
-    }
+    });
     return null;
   });
 
diff --git a/packages/fl_query_hooks/lib/src/use_query.dart b/packages/fl_query_hooks/lib/src/use_query.dart
index 2b29450..4b20d7e 100644
--- a/packages/fl_query_hooks/lib/src/use_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_query.dart
@@ -41,6 +41,10 @@ Query<T, Outside> useQuery<T extends Object, Outside>({
   final oldOnError = usePrevious(onError);
 
   final init = useCallback(([T? previousData]) {
+    final hasExternalDataChanged = !isShallowEqual(
+      query.value.externalData,
+      query.value.prevUsedExternalData,
+    );
     query.value = queryBowl.addQuery<T, Outside>(
       job,
       externalData: externalData,
@@ -50,10 +54,6 @@ Query<T, Outside> useQuery<T extends Object, Outside>({
       onError: onError,
     );
     update();
-    final hasExternalDataChanged = query.value.externalData != null &&
-        query.value.prevUsedExternalData != null &&
-        !isShallowEqual(
-            query.value.externalData!, query.value.prevUsedExternalData!);
     if (query.value.fetched && hasExternalDataChanged) {
       query.value.refetch();
     } else if (!query.value.fetched) {
@@ -82,51 +82,51 @@ Query<T, Outside> useQuery<T extends Object, Outside>({
   }, []);
 
   useEffect(() {
-    final hasOnErrorChanged = oldOnError != onError && oldOnError != null;
-    final hasOnDataChanged = oldOnData != onData && oldOnData != null;
-    if (oldJob != null && oldJob.queryKey != job.queryKey) {
-      disposeQuery();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final hasOnErrorChanged = oldOnError != onError && oldOnError != null;
+      final hasOnDataChanged = oldOnData != onData && oldOnData != null;
+      if (oldJob != null && oldJob.queryKey != job.queryKey) {
+        disposeQuery();
 
-      /// setting the new query's initial data as prev query's data
-      /// when [job.keepPreviousData] is true and both are dynamic
-      if (oldJob.isDynamic &&
-          job.isDynamic &&
-          oldJob.keepPreviousData == true &&
-          job.keepPreviousData == true) {
-        init(query.value.data);
-      } else {
-        init();
-      }
-    } else if (oldExternalData != null &&
-        externalData != null &&
-        !isShallowEqual(oldExternalData, externalData)) {
-      if (job.refetchOnExternalDataChange ??
-          queryBowl.refetchOnExternalDataChange) {
-        QueryBowl.of(context).fetchQuery(
-          job,
-          externalData: externalData,
-          onData: onData,
-          onError: onError,
-          key: uKey,
-        );
-      } else {
-        QueryBowl.of(context)
-            .getQuery(job.queryKey)
-            ?.setExternalData(externalData);
-      }
+        /// setting the new query's initial data as prev query's data
+        /// when [job.keepPreviousData] is true and both are dynamic
+        if (oldJob.isDynamic &&
+            job.isDynamic &&
+            oldJob.keepPreviousData == true &&
+            job.keepPreviousData == true) {
+          init(query.value.data);
+        } else {
+          init();
+        }
+      } else if (!isShallowEqual(oldExternalData, externalData)) {
+        if (job.refetchOnExternalDataChange ??
+            queryBowl.refetchOnExternalDataChange) {
+          QueryBowl.of(context).fetchQuery(
+            job,
+            externalData: externalData,
+            onData: onData,
+            onError: onError,
+            key: uKey,
+          );
+        } else {
+          QueryBowl.of(context)
+              .getQuery(job.queryKey)
+              ?.setExternalData(externalData);
+        }
 
-      if (hasOnDataChanged) query.value.removeDataListener(oldOnData);
-      if (hasOnErrorChanged) query.value.removeErrorListener(oldOnError);
-    } else {
-      if (hasOnDataChanged) {
-        query.value.removeDataListener(oldOnData);
-        if (onData != null) query.value.addDataListener(onData);
+        if (hasOnDataChanged) query.value.removeDataListener(oldOnData);
+        if (hasOnErrorChanged) query.value.removeErrorListener(oldOnError);
+      } else {
+        if (hasOnDataChanged) {
+          query.value.removeDataListener(oldOnData);
+          if (onData != null) query.value.addDataListener(onData);
+        }
+        if (hasOnErrorChanged) {
+          query.value.removeErrorListener(oldOnError);
+          if (onError != null) query.value.addErrorListener(onError);
+        }
       }
-      if (hasOnErrorChanged) {
-        query.value.removeErrorListener(oldOnError);
-        if (onError != null) query.value.addErrorListener(onError);
-      }
-    }
+    });
     return null;
   });
 
diff --git a/packages/fl_query_hooks/lib/src/use_query_bowl.dart b/packages/fl_query_hooks/lib/src/use_query_bowl.dart
new file mode 100644
index 0000000..7df1e81
--- /dev/null
+++ b/packages/fl_query_hooks/lib/src/use_query_bowl.dart
@@ -0,0 +1,9 @@
+import 'package:fl_query/fl_query.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+/// Simple hook based shorthand for [QueryBowl.of(context)]
+QueryBowl useQueryBowl() {
+  final context = useContext();
+
+  return QueryBowl.of(context);
+}
diff --git a/packages/fl_query_hooks/pubspec.yaml b/packages/fl_query_hooks/pubspec.yaml
index f035056..28a6d01 100644
--- a/packages/fl_query_hooks/pubspec.yaml
+++ b/packages/fl_query_hooks/pubspec.yaml
@@ -16,7 +16,8 @@ dependencies:
     sdk: flutter
   flutter_hooks: ^0.18.5+1
   uuid: ^3.0.6
-  fl_query: ^0.3.1
+  fl_query:
+    path: ../fl_query
 
 dev_dependencies:
   flutter_test: