Start of order history grouping; added some fixes for obtaining shippers