enhance pagination and fix order on day