Made usage of display_flag more consistent