Make sure that history data is constructed properly from the names of the
appropriate district and warehouse.
Merge branch 'temp'