Edit shows list
Add additional timeout handling