Improved performance in Sf2 completion