better handling of null/blank values