Fix links for years, add conditionals for undefined