Fixed validation issues

Also, I renamed typeUpdate to callType