Change logic for searching dataset dir