I think I've sketched a good proposal for HSEARCH-1270
IMO not a high priority atm though. We have much bigger fish to fry.