Fix issue with pagination on web UI
Fix issue with pagination