Implement optional search step skip for even more speed