Fix subnet tier persistence

Rebased #1444 with master and addressed comments from @aledsage