fix incorrect cellmap attribute + revise list pattern

@andreistefanescu please review