Feature/fix ghosting issue on contact selection