change fetching strategy and add Onboarding filtering