Clean-up of industry CHP chart queries