squashed pagination fixes