consistently use fileId as key