Two fixes to people autocomplete