fix payload / content-type handling