Added auto subscript option (disabled)
Avoid duplicate restore calls.  Also fix issue with line labels