Fixed implementation issue of ServiceBrowser