get bulk_prep working for date and number types, and alter overrides structure to include raw values