Fixed suggestion picking bugs