Thanks for the info, they tried removing the air flowmeters but still they come out of a cupboard and get mixed up.
You would have thought the design on the terminal would have also been a clue but it doesn't seem so.
Will probably suggest going down the air guard route, but you'd have thought there's be a few solutions out there by now.