Paginator issues due to switch fixed