#354 Fix pagination