Finder: simplify & fix