Deductions & credits

I have the same issue for Heat Pump Hybrid Water Heater from Rheem (K3A8) not getting added to credits.  Note that I also have 30% energy credits coming from Battery Storage which can be significant amount.  However I have tried several times by deleting the form 5695 and starting over with Home Energy Credits section trying different combinations; whether I include the Battery Storage or not, the credit for Heat Pump Water Heater remains zero.