Search speed improvements