Add vacuum; Fix paginate