fix service headers and texts