Move filtering into pop out