Fix HAL-395 / BZ1088379: Deployment filter only works in the first page