Fix date and tag structure everywhere

This really should be changed to one thing that you include other places, instead of having (basically) the same code in multiple places.