More enter key fixes when no values present.