Minor changes for remove generation of empty surname search keys.