How to Filter Features by Both Site and Locale in Payload CMS Without Mixing Content from Other Sites

[Derflex-primo]

I'm working with Payload CMS and have run into an issue with filtering data based on both site and locale. Here's an overview of my setup:

Locales Collection:

• A collection that defines various locales like en_US, es_ES, etc.

Sites Collection:

• Each site has a relationship to one or more locales.
  • site.a.com supports both es_ES and en_US.
  • site.b.com supports only its own specific locales.

Features Collection:

• Features have a relationship to Sites. For example:
  • Feature A is assigned to site.a.com.
  • Feature B is assigned to site.b.com.
  • Feature C is assigned to site.c.com.

The Issue:
When I query features for site.b.com with a specific locale (es_ES), Payload CMS returns all features for that locale, regardless of which site the feature actually belongs to. This results in features from site.a.com (since site.a.com supports es_ES) being included in the response for site.b.com.

For example:

• Only features related to site.b.com and locale es_ES should be returned.
• Features from site.a.com with the locale es_ES are also returned, leading to a mix of content from site.a.com and site.b.com.

This is the query I’m using:
http://localhost:3000/api/features?where[sites.domain][equals]=site.b.com&where[sites.locales.locales][equals]=es_ES&depth=2

What I've Tried:

• Filtering by both sites.domain and sites.locales.locales, but this seems to only filter by the locale and not the specific domain, leading to content leakage between sites.

Question:
How can I adjust my query (or configuration) so that it correctly filters features by both the domain and locale associated with each site, preventing features from site.a.com from showing up in queries for site.b.com?

NOTE:
I'm not building a multi-tenant admin dashboard.
Each site has entirely different content, but they share a single repository.