bugfix sort and filter