Here is the patch I've applied. It's mainly the same one but varies in subtle ways. I've also expanded the doc. I'll let you check it out.

What I have *not* done is a "unit" test actually indexing data and searching the data based on the filter making sure only the targeted shard(s) are used (ie user oriented test). Can someone carry on and add the test?