Fixed mislabeling of upcoming tenancies

Upcoming tenancies were sometimes incorrectly labeled as prior tenancies. This has been fixed so tenancy statuses now display accurately.