Added some index-finding stuff in PeopleHandler