diff --git a/app/components/Quiz/index.js b/app/components/Quiz/index.js
index c1f44b5..4d58503 100644
--- a/app/components/Quiz/index.js
+++ b/app/components/Quiz/index.js
@@ -408,9 +408,9 @@ export class Quiz extends Component {
   dispReview() {
     return this.props.currTask.topictree.map((topic, i) => {
         return (<div key={topic.id} style={{
-          "border": "2px solid black",
+          "border": "2px solid slategray",
           "padding": "15px",
-          "margin": "15px"
+          "margin": "15px 15px 15px 0px"
         }}>
           <div> {topic.name} </div>
           { this.mapQuestions(topic.questions) }
@@ -513,8 +513,8 @@ export class Quiz extends Component {
 
   handleSelect(evt, annotation) {
     // Activate the question for this highlight
-    const question_id = annotation.source.question_id;
-    this.props.activeQuestion(question_id);
+    const answer_id = annotation.source.answer_id;
+    this.props.activeAnswer(answer_id);
     let answerState = this.state.answerState;
     answerState.selectHighlight(annotation);
     this.setState({answerState});
diff --git a/app/model/QuizAnswers.js b/app/model/QuizAnswers.js
index 7bf425b..368e163 100644
--- a/app/model/QuizAnswers.js
+++ b/app/model/QuizAnswers.js
@@ -24,6 +24,7 @@ export class QuizAnswers {
     this.hasAnswer = this.hasAnswer.bind(this);
     this.getAnswerAnnotations = this.getAnswerAnnotations.bind(this);
     this.selectHighlight = this.selectHighlight.bind(this);
+    this.deselectHighlight = this.deselectHighlight.bind(this);
     this.highlightSelected = this.highlightSelected.bind(this);
     this.deleteSelection = this.deleteSelection.bind(this);
   }
@@ -69,6 +70,10 @@ export class QuizAnswers {
     this._selectedAnnotations.set(annotation.key, annotation);
   }
 
+  deselectHighlight(annotation) {
+    this._selectedAnnotations.clear();
+  }
+
   highlightSelected(annotation_key) {
     return this._selectedAnnotations.has(annotation_key);
   }
diff --git a/researcher/views.py b/researcher/views.py
index 466fa7c..8d6e925 100644
--- a/researcher/views.py
+++ b/researcher/views.py
@@ -209,7 +209,7 @@ def get(self, request):
         initial = { 'starting_article_id': agg['id__min'],
                     'ending_article_id': agg['id__max'],
                     'min_tokens_per_highlight': 1,
-                    'max_tokens_per_highlight': 1000,
+                    'max_tokens_per_highlight': 10000,
                     'pybossa_url': profile.pybossa_url,
                     'pybossa_api_key': profile.pybossa_api_key,
                     'debug_presenter': debug_presenter
diff --git a/thresher/serializers.py b/thresher/serializers.py
index 345e6fe..1764c04 100644
--- a/thresher/serializers.py
+++ b/thresher/serializers.py
@@ -91,11 +91,6 @@ class Meta:
         fields = ('id', 'article_number', 'batch_name', 'text', 'metadata')
 
 class AnswerSerializer(serializers.ModelSerializer):
-    question_id = serializers.SerializerMethodField()
-
-    def get_question_id(self, obj):
-        return obj.question.id
-
     class Meta:
         model = Answer
         fields = ('id', 'answer_number', 'answer_content', 'next_questions',