AJ-1573 Persist tier deletion, improve tier-metric front-end relation