some fixes for single finds