FIX some behavior in managing file list and NA