Clean-up of industry CHP chart queries
Merge pull request #724 from quintel/industry_chp_chart

Clean-up of industry CHP chart queries