Fixes T185: Column extra_flags cannot be null