Finder fetcher squash

I have made another change and squash them.
Rerun MB regression test against this branch