Adding search capability, removing paging.