I was thinking this might be the next phase when we wanted to solve the "notindex.xml" problem I mentioned. I think we should go with your latest proposal. It isn't backwards compatible, but it is fixing unexpected behavior and as you mentioned should have minimal impact on users. Can you update the pull request accordingly? At that point I can merge in the changes. Thanks!