change location logic

Addresses #627 - I've also added the additional field to UG progs plant on test & live.