refactor LookupKey
logic to reduce redundancy
#1635
Merged
LookupKey
logic to reduce redundancy
#1635