Fix pagination when polling
Fix ID checks