Moved industry queries

... and renamed monetized_heat to heat in some industry sub-sector queries.