T17: Fixed content-type recognition