swc-1324 - fixed up unique values, allow null in unique unless there is default value