some fixes to enable filtering of forgotten flags