Added additional ignores for empty cells