Bugfix files that exist are not found. Simplify prepareRow logic.