Add search and paging
Last for now changes