Make consolidation respect date handling