factor out date shim
improve link tracking