To be tested in Search 6, I think the finer-grained automatic reindexing resolvers to be implemented in HSEARCH-3199 In Progress should do the trick.