added pagination, but lost search