Added logic to allow person view to return on id or surname