Fix blank? and switch to empty?