fixed nulls, single quotes