simplify code
adapte test to simplified version of format filter
add the edit cell mode