Optimizations for updating list
Added hack to always display cast indicator
Fixed container selection
Source formatting