Harden algorithm for detecting annotations in the same conversation

This also fixes broken suggestion of concepts in Firefox