improve stream filter feature