Use cached metadata to improve display of search results, where it exists
Merge pull request #50 from lshift/issue18

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