Fix for KeyError: None in displayShows
Merge remote-tracking branch 'upstream/dev' into dev