Merge pull request #1909 from cfi-gb/add_service_corrections

Add corrections for service and variants.