Improve spot search