Add ability to search for names with spaces