fixed filter, still bug