pagination scroll block fix + cleanup