shame
Fixed bug where template vars would appear if returning to previous state.