fix the STREAM feed: make sure to handle custom streams