Search for location is better against the complete name

#4121