Which indices to query in elasticsearch depends on the namespaces being queried. By default geosearch api only queries ns 0, but it runs the query against the wiki alias, which always queries both $wiki_content and $wiki_general. Making this change should, mostly, cut the number of geo queries elasticsearch makes internally in half by querying the appropriate index instead of both.
Cirrus deals with that here:
which is then used here:
Perhaps some light refactoring on both ends is needed to share that code.