Added escape condition for role.display_order = nil