2007 Zetec Climate, Which Filters Do I Have ?

[Alexm]

Hi, I know obvious way is to open and check but I don't have the car at the moment.

I have a 2007 focus 1.8tdci zetec climate

On looking in the Haynes, the air filter is a panel, but I have a cylinder type one from my motor factors.

Also the oil filter is shown as cartridge in the Haynes, motor factor supplied metal one.

Who is right ??? I don't wanna take it to my mechanic to service, only to realise they are the wrong bits

[IINexusII]

air filter is the panel one and the oil filter is the metal one