Added detail
Better handle single quotes in data fields