Restructured scopeFinder to refresh instead of reinit