Fix unresolved issues year concatanation