Fixed build
working through pagination issues