Merge pull request #4007 from TGIshib/key

lookupByKey corrections