Amisha's latest changes to tenant view