fix flag lookup to use resolved IDs
2.1.0