removed unnecessary optimization (first step before removing filter_tasks altogether)