fix pagination & change url helper