When you put the pump back in, you need to reach right into the tank and make sure the filter is at the lowest possible point as they can get caught and sit higher in the tank causing fuel surging at low fuel levels.
Would also be worth putting 20 litres of fuel in the tank to tick low fuel off the list