Fix archived labels display
Merge branch 'MH-587' into dev