diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ed1e03f6e..36dc8f03b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:usesCleartextTraffic="true">
 
         <activity android:name=".ChooserActivity"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java b/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java
index d6ca06580..45d4e7c7a 100644
--- a/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java
+++ b/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java
@@ -43,12 +43,11 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         PageKey key = (PageKey) o;
-        if (mStartAfter == null && key.mStartAfter == null)
+        if (mStartAfter == null && key.mStartAfter == null &&
+                mEndBefore == null && key.mEndBefore == null)
             return true;
-        if (mEndBefore == null && key.mEndBefore == null)
-            return true;
-        return mStartAfter.getId() == key.mStartAfter.getId() &&
-                mEndBefore.getId() == key.mEndBefore.getId();
+        return mStartAfter.getId().equals(key.mStartAfter.getId()) &&
+                mEndBefore.getId().equals(key.mEndBefore.getId());
     }
 
     @Override