Fixed reading of dates/updated content hierarchy
Resolved merge conflicts.