Added better selection between tenantId and tenantName