Fixes in pagination