Allow optional second argument for service/id lookup.
Allow async custom service routing.
Tidy up.
rename find > lookup