A few paginators and search added