Completely re-worked stream filter flow