Fixed tenant issue with the UI