Fix Service Type string lookup

Change-Id: Ie127470c0671302b75a34b8d3c44b3be4c5054a3