Fix persist general vs basic variables displayed