rhbz980658 use fileId instead of contentLocation to refer to raw file lookup key