Handle contact selection. update #215