Use cached metadata to improve display of search results, where it exists

See #18.