more bug fixes from merge and contacts view enhancement