Fix issue with pagination
Fix issue with pagination on web UI