Issue #16: Filter annotations also by name