Adding basic search and pagigation