now handles apostrophes in mapping files