Improve the speed if it's not the first search