Some got combined too far, all of the がま entries meaning "toad" were combined into the がま entry that means bulrush, and all of the つじ風 & つむじ風 entries were combined into the entry with the せんぷう reading.
しばしば has two entries in the base dictionary, so I need to keep them someone separate. Linked the kana/kata versions, though.
As to the overgroupings, while がま was a mistake, the other ones share a unique definition ID in the base dictionary. I am testing a way to give them similar numbers so they appear separately, but it will most likely cause problems with the Text Analyzer down the road.