Improve flaggable flag forms