Improve query to match really only annotations and not also the button which has the same class.
Not working attempt at preventing newlines in comments. See #396