How to deal with messed-up sensor entity ids?

Hi folks,

I have been setting up a Z-Wave-Network with some Fibaro Roller Shutter 2 and Devolo Humidity Sensor mt02755. My current installation is Raspberry Pi 3 with ubuntu server 18.04 with Aeotec ZW090 Z-Stick Gen5 EU and HomeAssistant 0.69. I set it up with 0.68 and later on, upgraded to 0.69.

When trying to hide some of the badges at the top of default view, I found out, that obviously, I have some dead or orphaned sensor entities, which are called sensor.unknown and sensor.unknown_2. Furthermore, some of the sensors have 2 entities for the same sensor of the same z-wave device.

Example (for 2 Roller Shutters):
For each of these 2 Roller Shutters, I have 2 Power Sensors: sensor.fibaro_system_fgrm222_roller_shutter_controller_2_power
sensor.fibaro_system_fgrm222_roller_shutter_controller_2_power_2
sensor.fibaro_system_fgrm222_roller_shutter_controller_2_power_3
sensor.fibaro_system_fgrm222_roller_shutter_controller_2_power_4

But energy consumption sensors are all missing in the <> list of developer tools section. I suppose, these are the sensor.unknown items.

How can I get this mess to back to normal without having to reset all my Z-Wave network, what would mean a lot of work to me?

Found out, that this mess came after upgrading to a new version of HomeAssistant. After having upgraded from 0.69 to 0.71.0, suddenly, the energy sensor of a new Fibaro RollerShutter 2 previously added had sensor.unknown as id. I manually corrected it in entity_registry corresponding to the name of this sensors from other RollerShutters, but with next index in the end. This seems to work. But anyway, this seems to be a bug.