Some update and fixes

I injected a quick fix for pagination params and like others,