fixed some of where finders