Include URIs in results
Use latest lib-grimoire