New finder now obeys current scope.
Updated version.