refactor, lazy loading bug, funnel factory null handling