refiltering complete, sorting added