Use file item label in file picker (keep the slash)

And fix a new highlighing issue