refactored the field entries as displayField macro is already checking for null or empty value.