Ajay/Melanie | #2889/#2891 | Bugfix - Removed unwanted update of entity document for questionnaire submission