[TIMOB-12833] Bug fixes in require finder