Added with_flags scope
Fixed mess?