Added support for ' char in fields