Added fix for trailing whitespace in stream display names