Fix the households count when Solar installations are included - due to changing category name

**Describe the bug**
Recently some categorey names were changed, including chaning "Solar" to "Solar and Electricity".  This introduced a bug since "Solar" category waas hardcoded to add to the household count in some circumstances.

