Fixed dates
Fixed url generation