improve handling of funnel_stage and course