add filter and some fix