RBAC admin and query service bug fix.