some changes with filterable