Tweak pagination and add Following