Focus fixes. Better annotation filtering.