Fix for restarting issues and slow loading of shows