Is it possible to add proper tags to the Powerwall and Solar Gateway sensors so they may be used in the Energy dashboard?

[Noridin]

Only the battery % remaining shows up under the energy dashboard.

Thanks!