Fix unmatched file names and tags override mode