Merge pull request #32938 from deepeshgarg007/bg_query

chore: Remove raw SQL query