Fix annote and filter issue