Also fix FillBasedOnIndexFlags for matching single files