AAD-17: fixing viewer roles