#6289: Spotlight file better handle