pagination improvement