Edit adds new question, question numbers

Thanks Joanna for solving https://www.drupal.org/node/2404487

Some minor issues:
When I edit an existing Questionnaire (native), automatically a new Question is added. Bit annoying if one only wants to amend existing questions. Every time I have to remove the uninvited question before saving.

In the submission, a Question number is added. Can that be hidden, only showing the actual question?

Groet, Michiel