Extended filter flag in annotation
Improved naming