Fix on filter not populating correct page