diff --git a/website/src/pages/en/token-api/faq.mdx b/website/src/pages/en/token-api/faq.mdx
index 22af227f6c45..dddfb66bc4ae 100644
--- a/website/src/pages/en/token-api/faq.mdx
+++ b/website/src/pages/en/token-api/faq.mdx
@@ -57,61 +57,115 @@ DEXs listed below are grouped by network and ordered by most swaps. Only verifie
 
 Swaps are being reported via Swap programs and include amm_pool field
 
+##### Raydium
+
 - Raydium Liquidity Pool V4
-- Pump.fun AMM
-- Pump.fun
-- Raydium Concentrated Liquidity
+- Raydium CLMM
 - Raydium CPMM
+- Raydium Launchpad
+
+##### Pump.fun
+
+- Pump.fun AMM
+- Pump.fun Bonding Curve
+
+##### Meteora
+
 - Meteora DLMM Program
 - Meteora Pools Program
 - Meteora DAMM v2
-- Raydium Launchpad
+
+##### Others
+
+- Orca Whirlpool
+- Boop
+- Darklake
+- Dumpfun
+
+**Full support of Aggregator**
+
+Swaps are reported directly from Aggregator programs and do not include `amm_pool` field
+
+#### Jupiter
+
+- Jupiter V4
+- Jupiter V6
 
 **Partial support of AMM**
 
 Swaps are being reported via Aggregator programs and do not include amm_pool field
 
+##### Orca
+
 - Whirlpools Program
+- Orca Token Swap V2
+- Orca Token Swap
+
+##### Lifinity
+
 - Lifinity Swap V2
+- Lifinity Swap
+
+##### Stabble
+
+- Stabble Stable Swap
+- Stabble Weighted Swap
+
+##### Openbook
+
+- Openbook V2
+- OpenBook
+
+##### Saber
+
+- Saber Stable Swap
+- Saber Decimal Wrapper
+
+##### Sanctum
+
+- Sanctum Router Program
+- Sanctum Program
+
+##### Cropper
+
+- Cropper Whirlpool
+- Cropper Finance
+
+##### GooseFX
+
+- GooseFX: GAMMA
+- GooseFX V2
+
+##### Aldrin
+
+- Aldrin AMM V2
+- Aldrin AMM
+- GooseFX SSL
+
+##### Others
+
 - SolFi
 - Obric V2
-- Stabble Stable Swap
 - Phoenix
 - ZeroFi
-- Openbook V2
 - Invariant Swap
-- Stabble Weighted Swap
 - GoonFi
 - 1Dex Program
 - Fluxbeam Program
 - Mercurial Stable Swap
-- Saber Stable Swap
-- Orca Token Swap V2
-- Cropper Whirlpool
-- Lifinity Swap
 - Meteora Dynamic Bonding Curve Program
 - Moonit
 - BonkSwap
-- Saber Decimal Wrapper
 - Saros AMM
 - Jupiter Perpetuals
-- Sanctum Router Program
 - Numeraire
 - Crema Finance Program
-- Sanctum Program
-- GooseFX: GAMMA
-- Orca Token Swap
-- OpenBook
 - Swap Program
 - Guac Swap
 - Dexlab Swap
-- GooseFX V2
-- Aldrin AMM V2
 - Helium Treasury Management
-- Aldrin AMM
 - Symmetry Engine
 - Marinade Finance
-- Cropper Finance
 - Oasis
 - StepN DOOAR Swap
 - Penguin Finance
@@ -124,16 +178,24 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 - Sencha Cpamm
 - Clone
 - 1Sol
-- GooseFX SSL
 - Serum DEX V3
 
 #### Ethereum Mainnet
 
+##### Uniswap
+
 - Uniswap V2
 - Uniswap V3
 - Uniswap V1
 - Uniswap V4
+
+##### SushiSwap
+
 - SushiSwap V2
+- SushiSwap V3
+
+##### Others
+
 - Balancer
 - Cow
 - Curve
@@ -143,7 +205,6 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 - Crypto.com: DeFi Swap
 - PancakeSwap V2
 - Solidly V3
-- SushiSwap V3
 - KyberSwap Elastic
 - Dodo
 - WOOFi
@@ -164,17 +225,25 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Arbitrum One
 
+##### Uniswap
+
 - Uniswap V3
 - Uniswap V4
+- Uniswap V2
+
+##### SushiSwap
+
 - SushiSwap V3
+- SushiSwap V2
+
+##### Others
+
 - Balancer
 - Curve
 - Ramses
 - KyberSwap Elastic
 - WOOFi
 - Dodo
-- SushiSwap V2
-- Uniswap V2
 - Camelot
 - GammaSwap
 - Solidly V3
@@ -189,15 +258,23 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Polygon Mainnet
 
-- Quickswap V2
+##### Uniswap
+
 - Uniswap V3
 - Uniswap V4
-- SushiSwap V2
 - Uniswap V2
+
+##### SushiSwap
+
+- SushiSwap V2
+- SushiSwap V3
+
+##### Others
+
+- Quickswap V2
 - Balancer
 - Curve
 - Stabl.fi
-- SushiSwap V3
 - KyberSwap Elastic
 - Dodo
 - WOOFi
@@ -213,17 +290,32 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Unichain Mainnet
 
+##### Uniswap
+
 - Uniswap V4
 - Uniswap V3
 - Uniswap V2
+
+##### Others
+
 - KyberSwap Elastic
 
 #### BSC Mainnet
 
+##### PancakeSwap
+
 - PancakeSwap V2
 - PancakeSwap V3
 - PancakeSwap V4
 - PancakeSwap V1
+
+##### Nomiswap
+
+- Nomiswap
+- Nomiswap Stable
+
+##### Others
+
 - Biswap
 - Dodo
 - WOOFi
@@ -231,8 +323,6 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 - ApeSwap V2
 - MDEX
 - BabySwap
-- Nomiswap
-- Nomiswap Stable
 - JulSwap
 - Algebra (v3-style)
 - WaultSwap
@@ -243,10 +333,18 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Optimism Mainnet
 
+##### Uniswap
+
 - Uniswap V3
 - Uniswap V4
+
+##### Velodrome
+
 - Velodrome V3
 - Velodrome V2
+
+##### Others
+
 - Balancer
 - Curve
 - Beethoven X
@@ -256,9 +354,14 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Avalanche C-Chain
 
-- LFJ (Trader Joe)
+##### Pangolin
+
 - Pangolin V2
 - Pangolin V1
+
+##### Others
+
+- LFJ (Trader Joe)
 - KyberSwap Elastic
 - Elk Finance
 - Uniswap V4
@@ -269,32 +372,54 @@ Swaps are being reported via Aggregator programs and do not include amm_pool fie
 
 #### Base Mainnet
 
+##### Uniswap
+
 - Uniswap V3
 - Uniswap V2
 - Uniswap V4
+
+##### BaseSwap
+
+- BaseSwap
+- BaseSwap V2
+
+##### Alien Base
+
+- Alien Base V3
+- Alien Base V2
+
+##### Others
+
 - Aerodrome
 - SushiSwap V2
 - Balancer
 - KyberSwap Elastic
 - Curve
-- BaseSwap
-- Alien Base V3
-- BaseSwap V2
 - Solidly V3
-- Alien Base V2
 
 #### Tron Mainnet
 
-- SunPump
+##### SunSwap
+
 - SunSwap V2
 - SunSwap V1 (JustSwap)
-- USwap
 - SunSwap 1.5 (JustSwap)
+
+##### ISwap
+
 - ISwap V1
-- JustMoney
-- SocialSwap V2
 - ISwap V2
+
+##### SocialSwap
+
+- SocialSwap V2
 - SocialSwap V1
+
+##### Others
+
+- SunPump
+- USwap
+- JustMoney
 - WhiteSwap
 - Oikos Swap V2