bug fix
filtering bug fix