Apply node group approach to final demand per sector per carrier queries for biofuels and oils (#3235)