Make the output of search_origin_metadata a superset of that of search_metadata.

So the same client code can be used to parse both.

This also provides the origin type and URL directly, and spares a
request from the client.