Fixed problem with pagination, simplify routes
Fixed problem with pagination, simplify routes