Fixed unicode shlex badness
Fixed unicode shlex badness
Make rescan lock the index a bit less