Spitting diesel

My new td5 is a bit of a bitch at the diesel pumps, It always splashes and cuts off the pump and sometimes it spits out diesel even if I stopped the pump seconds ago. I can also here it 'gargling' the fuel down. Is this normal and has anyone got any ideas how to fix this? its getting really annoying and it takes me ages to fill up.

The problem is within the filler tube....it also has an atmospheric vent pipe which might be clogged, nr. 3