IN-392 Changes the finder to avoid duplications