EDI VH: get rid of remaining uses of a bilinear filter
EDI: more consistent array numbering