Service catalog should locate services by type, not by name (fixes #123)