diff --git a/src/config.rs b/src/config.rs
index 54fc9dc..a58422e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -16,8 +16,7 @@ pub struct Config {
     pub kafka: Kafka,
     #[serde_as(as = "DisplayFromStr")]
     pub network_subgraph: Url,
-    #[serde(default)]
-    pub query_auth: Option<String>,
+    pub query_auth: Hidden<String>,
     #[serde_as(as = "DisplayFromStr")]
     pub rpc_url: Hidden<Url>,
     pub secret_key: Hidden<B256>,
diff --git a/src/main.rs b/src/main.rs
index 0dfa459..804d08d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -71,10 +71,10 @@ async fn main() -> anyhow::Result<()> {
         .build()?;
     let mut network_subgraph =
         SubgraphClient::builder(http_client.clone(), config.network_subgraph)
-            .with_auth_token(config.query_auth.clone())
+            .with_auth_token(Some(config.query_auth.clone()))
             .build();
     let mut escrow_subgraph = SubgraphClient::builder(http_client.clone(), config.escrow_subgraph)
-        .with_auth_token(config.query_auth)
+        .with_auth_token(Some(config.query_auth.clone()))
         .build();
 
     let authorized_signers = authorized_signers(&mut escrow_subgraph, &sender_address)
@@ -275,7 +275,7 @@ async fn active_indexers(
         id: Address,
     }
     Ok(network_subgraph
-        .paginated_query::<Indexer>(query, 200)
+        .paginated_query::<Indexer>(query, 500)
         .await
         .map_err(|err| anyhow!(err))?
         .into_iter()
@@ -319,7 +319,7 @@ async fn escrow_accounts(
         id: Address,
     }
     let response = escrow_subgraph
-        .paginated_query::<EscrowAccount>(query, 200)
+        .paginated_query::<EscrowAccount>(query, 500)
         .await;
     match response {
         Ok(accounts) => Ok(accounts
diff --git a/src/receipts.rs b/src/receipts.rs
index 48adfe7..f39229c 100644
--- a/src/receipts.rs
+++ b/src/receipts.rs
@@ -24,7 +24,7 @@ pub async fn track_receipts(
     let mut client_config = rdkafka::ClientConfig::new();
     client_config.extend(config.config.clone().into_iter());
     let defaults = [
-        ("group.id", "gw-escrow-manager"),
+        ("group.id", "tap-escrow-manager"),
         ("enable.auto.commit", "true"),
         ("auto.offset.reset", "earliest"),
     ];