[Suggestion] Adjustments to Empty Cell behavior