Fixed a few issues and moved to server side paging