Search by other columns

- Fixed some of the merge issues?
- Added other columns to search by when you add people