fix service choices