Remove unneeded import
Fix merge conflict
Increase preference
Remove debugging message
Increase search envelope when linking
Change to client-side translation for generic name