Fix service param handling

Change-Id: Idd83e65d17f5cbd181e668edffaba66cd298cf8f