Merge "Check for empty lookup keys in getLookupUri"