Fixed baseyear extraction code