Search now uses sessions as well