Admin / template / display order is not saved & restored properly (#1287).