Now handles 'NULL' values as empty strings