Fixed 2 errors and added a FinderinFinder.

FinderInFinder allows you to find things in another finders
results.

Fixed issues due to bad merge.