Improved quickfind