Filters to annotations and bug fixes