I think it’s a question of ‘do we need to make search better or do we need to split up some of our entries?’
I would much rather have separate entries for each grammar point, because that means more practice sentences for the SRS. There have been moments in the past where different usages of a similar looking grammar point have been lumped together in one entry (for example) and that means that you only get half the practice with each of the usages. It kinds of breaks the way SRS is supposed to work (in my opinion).