Remove TODO dealt with in the last commit.
Fix bug introduced by removing pointer indirection.
Seems that searching for a service also works.