Add missing import
Drop ND GAF lines when filtering by term