Fix previous commit corner cases

Change the cell selector and cover all cases.