ContentType fix and added ontimeout listener