reintroduce fileid
Map by location, not USR
much better