[7.3.1] Use target.getLookupKey() for contstructing lookup keys for vendor mode

[7.3.1] Use target.getLookupKey() for contstructing lookup keys for vendor mode #4138