AI-522 : introduced FilterCellAction + code improvements