Others fixes for pagination