Fixes to the retrieval of the commodity_name.