Tuya Circuit Breaker not updating power consumed

I am using a tuya compatible circuit breaker and it is integrated in Home Assistant via Tuya v2.
I am facing 2 issues using this.

  1. Energy consumed is coming in “kW-h” while home assistant is expecting “kWh” (without hyphen).
  2. Energy consumed is not getting updated automatically. Whenever I restart server, I get updated value.
    Thanks in anticipation!!