array_contains fix,(or|and)_dg