Don't waste too much time looking for an in tank fuel filter on the diesel, and don't waste money on a clip.
If the ITP is running then it sounds like you have a problem with the pipework in the tank, and air is getting into the circuit when the level is low.
Just to double check, whip the plug off the top of the UBP and then listen again at the open filler cap.