Fixing inconsistent use of First/Last name in Advanced Search