added pagination, simple search