Fixed name replacing and missing data.