Handle multi-word last names
* #1957