Improved query parameter propagation to paginator