Split into separate modules
Extract filtered on viewport stepper