fix bug
add filter by name/position