Improve Episode and Season Controllers