Main Search Tided Up