Minor fix to prepare_data_product_support()