Improved handling of new form of q10 settings