[support] Reducing Number of Queries