refactor filters and add sort to column