LPS-35408 - LPS-35469 - Search Container pagination fixes

Hey Brian,

Those are 2 different LPS tickets because they are different issues but they could conflict, so I just sent them in one pull request. 

Thanks!