Resolve issues with requestion list of services

Change-Id: I02c4ea4e184a58389c5f15e473f6eacbe3bd3796