[Bug 30] Adding single quotes into fields