fixes filter / pagination behaviour