re-adding code for pagination multi-tenant check