Added conversation selection fix