anchor.diff:      ResourceBundle resourceBundle = ResourceBundle.getBundle(BUNDLE, request.getLocale(), new
               EncodedControl(StandardCharsets.UTF_8.toString()));
       String urlData = request.getParameter("data");
  -    // Extract the challege questions from the request and add them into an array
  +    // Extract the challenge questions from the request and add them into an array
       String[] questionSets = urlData.split("&");
  -    // Hashmap to hold user's challenge questions
  +    // Hash-map to hold user's challenge questions
       Map<String, List<ChallengeQuestion>> challengeQuestionMap = new HashMap<>();
   
       for (String question : questionSets) {
           String[] questionProperties = question.split("\\|");
           // Construct a new ChallengeQuestion for each challenge question received from the request
  -        ChallengeQuestion tempChallengeQuesion = new ChallengeQuestion();
  -        tempChallengeQuesion.setQuestionSetId(questionProperties[0]);
  -        tempChallengeQuesion.setQuestionId(questionProperties[1]);
  -        tempChallengeQuesion.setQuestion(questionProperties[2]);
  -        // Add the challenge question to the Hashmap
  +        ChallengeQuestion tempChallengeQuestions = new ChallengeQuestion();
  +        tempChallengeQuestions.setQuestionSetId(questionProperties[0]);
  +        tempChallengeQuestions.setQuestionId(questionProperties[1]);
  +        tempChallengeQuestions.setQuestion(questionProperties[2]);
  +        // Add the challenge question to the Hash-map
           List<ChallengeQuestion> challengeQuestionList = challengeQuestionMap.get(questionProperties[0]);
           if (challengeQuestionList == null) {
               List<ChallengeQuestion> tempList = new ArrayList<>();
  -            tempList.add(tempChallengeQuesion);
  +            tempList.add(tempChallengeQuestions);
               challengeQuestionMap.put(questionProperties[0], tempList);
           } else {
  -            challengeQuestionList.add(tempChallengeQuesion);
  +            challengeQuestionList.add(tempChallengeQuestions);
           }
       }
   %>
  
positive.code:                 <div class="col-sm-8">
                      <input type="text" class="form-control" id="answer_to_questions"
                             placeholder="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "type.your.security.answer")%>"
                             name=<%="A-" + Encode.forHtmlAttribute(list1)%>>
                  </div>
              </div>
          </dev>
  
negative.code:                  "select.challenge.question")%>
                  </label>
                  <div class="col-sm-8">
                      <select class="form-control" id="challengeQuestion1"
                              name=<%="Q-" + Encode.forHtmlAttribute(challengeQuestionSet)%>>
                          <%
                              for (ChallengeQuestion challengeQuestion : challengeQuestionMap.get(challengeQuestionSet)) {
                          %>
                          <option name="q" selected="selected" value="<%=Encode.forHtmlAttribute(challengeQuestion.getQuestion())%>">
                              <%=Encode.forHtmlContent(challengeQuestion.getQuestion())%>
                          </option>
                          <%
                              }
  