Attempting fix for broken names in searches.