diff --git a/src/components/ComboInputField.tsx b/src/components/ComboInputField.tsx
index dfdc9f27..3d427cb8 100644
--- a/src/components/ComboInputField.tsx
+++ b/src/components/ComboInputField.tsx
@@ -313,7 +313,8 @@ function ComboInputField({
       setAmount("0");
       lastInternalAmountRef.current = "0";
     }
-  }, [selectedToken, setAmount]);
+    // biome-ignore lint/correctness/useExhaustiveDependencies: Only reset on token change, not callback reference change
+  }, [selectedToken]);
 
   /**
    * Clamp the internal amount to the max amount
diff --git a/src/generated/gql/exchange/graphql.ts b/src/generated/gql/exchange/graphql.ts
index 96429785..bbcf894a 100644
--- a/src/generated/gql/exchange/graphql.ts
+++ b/src/generated/gql/exchange/graphql.ts
@@ -29,44 +29,6 @@ export type Scalars = {
   Timestamp: { input: any; output: any; }
 };
 
-export type Account = {
-  __typename?: 'Account';
-  id: Scalars['Bytes']['output'];
-  trades: Array<Trade>;
-};
-
-
-export type AccountTradesArgs = {
-  first?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<TradeOrderBy>;
-  orderDirection?: InputMaybe<OrderDirection>;
-  skip?: InputMaybe<Scalars['Int']['input']>;
-  where?: InputMaybe<TradeFilter>;
-};
-
-export type AccountFilter = {
-  /** Filter for the block changed event. */
-  _change_block?: InputMaybe<BlockChangedFilter>;
-  and?: InputMaybe<Array<InputMaybe<AccountFilter>>>;
-  id?: InputMaybe<Scalars['Bytes']['input']>;
-  id_contains?: InputMaybe<Scalars['Bytes']['input']>;
-  id_gt?: InputMaybe<Scalars['Bytes']['input']>;
-  id_gte?: InputMaybe<Scalars['Bytes']['input']>;
-  id_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
-  id_lt?: InputMaybe<Scalars['Bytes']['input']>;
-  id_lte?: InputMaybe<Scalars['Bytes']['input']>;
-  id_not?: InputMaybe<Scalars['Bytes']['input']>;
-  id_not_contains?: InputMaybe<Scalars['Bytes']['input']>;
-  id_not_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
-  or?: InputMaybe<Array<InputMaybe<AccountFilter>>>;
-  trades_?: InputMaybe<TradeFilter>;
-};
-
-export enum AccountOrderBy {
-  id = 'id',
-  trades = 'trades'
-}
-
 export enum AggregationInterval {
   day = 'day',
   hour = 'hour'
@@ -1284,6 +1246,7 @@ export type ConvertCandidateFilter = {
 
 export enum ConvertCandidateOrderBy {
   addLiquidityTrade = 'addLiquidityTrade',
+  addLiquidityTrade__account = 'addLiquidityTrade__account',
   addLiquidityTrade__blockNumber = 'addLiquidityTrade__blockNumber',
   addLiquidityTrade__hash = 'addLiquidityTrade__hash',
   addLiquidityTrade__id = 'addLiquidityTrade__id',
@@ -1298,6 +1261,7 @@ export enum ConvertCandidateOrderBy {
   addLiquidityTrade__transferVolumeUSD = 'addLiquidityTrade__transferVolumeUSD',
   id = 'id',
   removeLiquidityTrade = 'removeLiquidityTrade',
+  removeLiquidityTrade__account = 'removeLiquidityTrade__account',
   removeLiquidityTrade__blockNumber = 'removeLiquidityTrade__blockNumber',
   removeLiquidityTrade__hash = 'removeLiquidityTrade__hash',
   removeLiquidityTrade__id = 'removeLiquidityTrade__id',
@@ -1402,8 +1366,6 @@ export type Query = {
   __typename?: 'Query';
   /** Access to subgraph metadata */
   _meta?: Maybe<Meta>;
-  account?: Maybe<Account>;
-  accounts: Array<Account>;
   aquifer?: Maybe<Aquifer>;
   aquifers: Array<Aquifer>;
   beanstalk?: Maybe<Beanstalk>;
@@ -1444,24 +1406,6 @@ export type QueryMetaArgs = {
 };
 
 
-export type QueryAccountArgs = {
-  block?: InputMaybe<BlockHeight>;
-  id: Scalars['ID']['input'];
-  subgraphError?: SubgraphErrorPolicy;
-};
-
-
-export type QueryAccountsArgs = {
-  block?: InputMaybe<BlockHeight>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<AccountOrderBy>;
-  orderDirection?: InputMaybe<OrderDirection>;
-  skip?: InputMaybe<Scalars['Int']['input']>;
-  subgraphError?: SubgraphErrorPolicy;
-  where?: InputMaybe<AccountFilter>;
-};
-
-
 export type QueryAquiferArgs = {
   block?: InputMaybe<BlockHeight>;
   id: Scalars['ID']['input'];
@@ -1953,7 +1897,7 @@ export enum TokenOrderBy {
 export type Trade = {
   __typename?: 'Trade';
   /** Account that sent this transaction */
-  account: Account;
+  account: Scalars['Bytes']['output'];
   /** Well.reserves after this event */
   afterReserves: Array<Scalars['BigInt']['output']>;
   /** Well.tokenRates before this event */
@@ -2015,27 +1959,16 @@ export enum TradeType {
 export type TradeFilter = {
   /** Filter for the block changed event. */
   _change_block?: InputMaybe<BlockChangedFilter>;
-  account?: InputMaybe<Scalars['String']['input']>;
-  account_?: InputMaybe<AccountFilter>;
-  account_contains?: InputMaybe<Scalars['String']['input']>;
-  account_contains_nocase?: InputMaybe<Scalars['String']['input']>;
-  account_ends_with?: InputMaybe<Scalars['String']['input']>;
-  account_ends_with_nocase?: InputMaybe<Scalars['String']['input']>;
-  account_gt?: InputMaybe<Scalars['String']['input']>;
-  account_gte?: InputMaybe<Scalars['String']['input']>;
-  account_in?: InputMaybe<Array<Scalars['String']['input']>>;
-  account_lt?: InputMaybe<Scalars['String']['input']>;
-  account_lte?: InputMaybe<Scalars['String']['input']>;
-  account_not?: InputMaybe<Scalars['String']['input']>;
-  account_not_contains?: InputMaybe<Scalars['String']['input']>;
-  account_not_contains_nocase?: InputMaybe<Scalars['String']['input']>;
-  account_not_ends_with?: InputMaybe<Scalars['String']['input']>;
-  account_not_ends_with_nocase?: InputMaybe<Scalars['String']['input']>;
-  account_not_in?: InputMaybe<Array<Scalars['String']['input']>>;
-  account_not_starts_with?: InputMaybe<Scalars['String']['input']>;
-  account_not_starts_with_nocase?: InputMaybe<Scalars['String']['input']>;
-  account_starts_with?: InputMaybe<Scalars['String']['input']>;
-  account_starts_with_nocase?: InputMaybe<Scalars['String']['input']>;
+  account?: InputMaybe<Scalars['Bytes']['input']>;
+  account_contains?: InputMaybe<Scalars['Bytes']['input']>;
+  account_gt?: InputMaybe<Scalars['Bytes']['input']>;
+  account_gte?: InputMaybe<Scalars['Bytes']['input']>;
+  account_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
+  account_lt?: InputMaybe<Scalars['Bytes']['input']>;
+  account_lte?: InputMaybe<Scalars['Bytes']['input']>;
+  account_not?: InputMaybe<Scalars['Bytes']['input']>;
+  account_not_contains?: InputMaybe<Scalars['Bytes']['input']>;
+  account_not_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
   afterReserves?: InputMaybe<Array<Scalars['BigInt']['input']>>;
   afterReserves_contains?: InputMaybe<Array<Scalars['BigInt']['input']>>;
   afterReserves_contains_nocase?: InputMaybe<Array<Scalars['BigInt']['input']>>;
@@ -2255,7 +2188,6 @@ export type TradeFilter = {
 
 export enum TradeOrderBy {
   account = 'account',
-  account__id = 'account__id',
   afterReserves = 'afterReserves',
   afterTokenRates = 'afterTokenRates',
   beforeReserves = 'beforeReserves',
diff --git a/src/generated/gql/pintostalk/graphql.ts b/src/generated/gql/pintostalk/graphql.ts
index 78aa7d75..5f99c7fe 100644
--- a/src/generated/gql/pintostalk/graphql.ts
+++ b/src/generated/gql/pintostalk/graphql.ts
@@ -3413,6 +3413,8 @@ export type Plot = {
   __typename?: 'Plot';
   /** Number of beans spent for each pod, whether through sowing or on the marketplace */
   beansPerPod: Scalars['BigInt']['output'];
+  /** Block number of the most recent plot combination, null if never combined */
+  combinedAtBlock?: Maybe<Scalars['BigInt']['output']>;
   /** Timestamp of entity creation (not sown) */
   createdAt: Scalars['BigInt']['output'];
   /** Transaction hash of when this plot entity was created (not sown) */
@@ -3496,6 +3498,14 @@ export type PlotFilter = {
   beansPerPod_lte?: InputMaybe<Scalars['BigInt']['input']>;
   beansPerPod_not?: InputMaybe<Scalars['BigInt']['input']>;
   beansPerPod_not_in?: InputMaybe<Array<Scalars['BigInt']['input']>>;
+  combinedAtBlock?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_gt?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_gte?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_in?: InputMaybe<Array<Scalars['BigInt']['input']>>;
+  combinedAtBlock_lt?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_lte?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_not?: InputMaybe<Scalars['BigInt']['input']>;
+  combinedAtBlock_not_in?: InputMaybe<Array<Scalars['BigInt']['input']>>;
   createdAt?: InputMaybe<Scalars['BigInt']['input']>;
   createdAt_gt?: InputMaybe<Scalars['BigInt']['input']>;
   createdAt_gte?: InputMaybe<Scalars['BigInt']['input']>;
@@ -3811,6 +3821,7 @@ export type PlotFilter = {
 
 export enum PlotOrderBy {
   beansPerPod = 'beansPerPod',
+  combinedAtBlock = 'combinedAtBlock',
   createdAt = 'createdAt',
   creationHash = 'creationHash',
   farmer = 'farmer',
@@ -5140,6 +5151,7 @@ export enum PodListingOrderBy {
   originalPlaceInLine = 'originalPlaceInLine',
   plot = 'plot',
   plot__beansPerPod = 'plot__beansPerPod',
+  plot__combinedAtBlock = 'plot__combinedAtBlock',
   plot__createdAt = 'plot__createdAt',
   plot__creationHash = 'plot__creationHash',
   plot__fieldId = 'plot__fieldId',