More find-mode performance improvements