replace map and filter by comprenhension lists
Merge branch '25_refactor_table'. fix #25