fix quotes; use stream id if available