fix topic selection