fixing findWiths and findFirst