We need to rework this as part of the filters revamp. "indexed_by" being a mix of filters keeps biting us.
So that we can reuse in other scenarios