Indeed, looks like this use cases escaped the refactoring I have done for XWIKI-22440. The search must be doing its own thing for some reason.