Minor - format code
Adding global and multiple question support (not finished) see BT#8659