content disposition/header fix/cleanup