do not only match for SSpans but also for SToken in AnnotationNameMatcher

this is an attempt to fix the bug #120, please test