fix sortable and add filterable