@yedi and I talked about this in person.  We talked about making the demo user's domain be a list of all domains, but that's not a great option.  We decided that to include the demo user, just have an OR over the filters where the second clause is the demo user id.  Yedi will include this in his filter, which is the primary use case for this index addition.