[WO-660] Add flagged to flag options