Made changes based on comments specifically on Event related content type fields