Fix untracked files invisible
Simplify file-list code