Modifying feeds for Home Assistant Energy compatibility

Refer my posts here:

I believe there are some updates about to arrive in HA 2021.9 for the Energy facility.