Fixes to path search and added XMP search