Fix file_managed:uri collation, part 2