diff --git a/src/components/Assessment.tsx b/src/components/Assessment.tsx
index 56d9d09..6e338a8 100644
--- a/src/components/Assessment.tsx
+++ b/src/components/Assessment.tsx
@@ -154,7 +154,7 @@ export default class Assessment extends React.Component<IBaseProps, AssessmentSt
         return results.json();
       })
       .then(data => {
-        this.setState({certification: data as Certification, session: this.getDefaultState().session, activeQuestion: -1});
+        this.setState({certification: data as Certification, session: this.getDefaultState().session, activeQuestion: -1, selectedQuestions: {}});
       });
   }
 
diff --git a/src/components/AssessmentHistory.tsx b/src/components/AssessmentHistory.tsx
index 180379b..4515711 100644
--- a/src/components/AssessmentHistory.tsx
+++ b/src/components/AssessmentHistory.tsx
@@ -108,7 +108,7 @@ export default class AssessmentHistory extends React.PureComponent<IBaseProps, A
     sortable = sortable.map(arr => {
       let question = this.state.certification.questions.find(q => q.id === arr[0]);
 
-      return [question.key, arr[1], question.position]
+      return [question.key || question.id, arr[1], question.position]
     });
 
     sortable = sortable.sort((a, b) => (a[2] as number) - (b[2] as number));
@@ -163,6 +163,7 @@ export default class AssessmentHistory extends React.PureComponent<IBaseProps, A
                 }]
               }}
               options={{
+
                 responsive: true,
                 scales: {
                   yAxes: [{
diff --git a/src/components/QuestionSelectionList.tsx b/src/components/QuestionSelectionList.tsx
index d0bb4c0..8ee3bba 100644
--- a/src/components/QuestionSelectionList.tsx
+++ b/src/components/QuestionSelectionList.tsx
@@ -1,12 +1,12 @@
 import * as React from "react";
-import { InputGroup, FormControl, ButtonToolbar, ToggleButtonGroup, ToggleButton } from "react-bootstrap";
+import { InputGroup, FormControl, ButtonToolbar, ToggleButtonGroup, ToggleButton, Button, DropdownButton, MenuItem } from "react-bootstrap";
 import Question from "../model/Question";
 import AssessmentSession from "../model/AssessmentSession";
 import QuestionSelection from "./QuestionSelection";
 import FieldGroup from "./FieldGroup";
 import IBaseProps from "../domain/IBaseProps";
 import IAssociativeArray from "../domain/IAssociativeArray";
-import { checkIfAnsweredCorrectly } from "../domain/AssessmentLogic";
+import { checkIfAnsweredCorrectly, calculateScorePerQuestion } from "../domain/AssessmentLogic";
 
 export interface QuestionSelectionListProps extends IBaseProps {
   questions: Array<Question>;
@@ -15,21 +15,46 @@ export interface QuestionSelectionListProps extends IBaseProps {
   selectedQuestions: IAssociativeArray<boolean>;
 }
 
-export default class QuestionSelectionList extends React.PureComponent<QuestionSelectionListProps, undefined> {
+enum FilterType {
+  GreaterEqual,
+  LessEqual
+}
+
+interface QuestionSelectionListState {
+  selectionByQuestionScoreEnabled: boolean;
+  filterType: FilterType;
+  filterValue: number;
+}
+
+export default class QuestionSelectionList extends React.PureComponent<QuestionSelectionListProps, QuestionSelectionListState> {
   constructor(props: QuestionSelectionListProps) {
     super(props);
 
+    this.state = {
+      selectionByQuestionScoreEnabled: false,
+      filterType: FilterType.LessEqual,
+      filterValue: 99
+    };
+
     this.selectNone = this.selectNone.bind(this);
     this.selectAll = this.selectAll.bind(this);
     this.selectAnsweredIncorrectlyLastTime = this.selectAnsweredIncorrectlyLastTime.bind(this);
+    this.selectByQuestionScore = this.selectByQuestionScore.bind(this);
+    this.showByQuestionScoreFilter = this.showByQuestionScoreFilter.bind(this);
+    this.hideByQuestionScoreFilter = this.hideByQuestionScoreFilter.bind(this);
+    this.setFilterToLessEqual = this.setFilterToLessEqual.bind(this);
+    this.setFilterToGreaterEqual = this.setFilterToGreaterEqual.bind(this);
+    this.setFilterValue = this.setFilterValue.bind(this);
   }
 
   selectNone(e: any){
-    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = false; return acc; }, {} as IAssociativeArray<boolean>))
+    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = false; return acc; }, {} as IAssociativeArray<boolean>));
+    this.hideByQuestionScoreFilter();
   }
 
   selectAll(e: any){
-    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = true; return acc; }, {} as IAssociativeArray<boolean>))
+    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = true; return acc; }, {} as IAssociativeArray<boolean>));
+    this.hideByQuestionScoreFilter();
   }
 
   selectAnsweredIncorrectlyLastTime(e: any){
@@ -41,21 +66,79 @@ export default class QuestionSelectionList extends React.PureComponent<QuestionS
     let lastSession = this.props.previousSessions[0];
     let incorrectLastTime = lastSession.certification.questions.filter(q => !checkIfAnsweredCorrectly(q.answers, lastSession.answers[q.id].reduce((acc, val) => { acc[val] = true; return acc; }, { } as IAssociativeArray<boolean>)));
 
-    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = incorrectLastTime.some(q => q.id === val.id); return acc; }, {} as IAssociativeArray<boolean>))
+    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = incorrectLastTime.some(q => q.id === val.id); return acc; }, {} as IAssociativeArray<boolean>));
+    this.hideByQuestionScoreFilter();
+  }
+
+  selectByQuestionScore(e: any){
+    let ratios = calculateScorePerQuestion(this.props.previousSessions);
+
+    // Sorted by created on descending in SQL query
+    let filteredRatios = Object.keys(ratios).filter(key => this.state.filterType === FilterType.LessEqual ? ratios[key] <= this.state.filterValue : ratios[key] >= this.state.filterValue );
+    this.props.onSelectionChange(this.props.questions.reduce((acc, val) => { acc[val.id] = filteredRatios.some(q => q === val.id); return acc; }, {} as IAssociativeArray<boolean>));
+  }
+
+  hideByQuestionScoreFilter() {
+    this.setState({
+      selectionByQuestionScoreEnabled: false
+    });
+  }
+
+  showByQuestionScoreFilter(e: any) {
+    if (!e.target.checked) {
+      return;
+    }
+
+    this.setState({
+      selectionByQuestionScoreEnabled: true
+    });
+  }
+
+  setFilterToGreaterEqual () {
+    this.setState({
+      filterType: FilterType.GreaterEqual
+    });
+  }
+
+  setFilterToLessEqual () {
+    this.setState({
+      filterType: FilterType.LessEqual
+    });
+  }
+
+  setFilterValue (e: any) {
+    this.setState({
+      filterValue: parseInt(e.target.value)
+    });
   }
 
   render(){
     return (
       <div>
         <p>Please select the questions you want to train during this assessment</p>
-        <ButtonToolbar>
+
+        <ButtonToolbar style={{"padding-bottom": "20px"}}>
           <ToggleButtonGroup type="radio" name="options" defaultValue={1}>
             <ToggleButton onClick={this.selectNone} value={1}>None</ToggleButton>
             <ToggleButton onClick={this.selectAll} value={2}>All</ToggleButton>
             <ToggleButton disabled={!this.props.previousSessions || !this.props.previousSessions.length} onClick={this.selectAnsweredIncorrectlyLastTime} value={3}>Answered Incorrectly Last Time</ToggleButton>
+            <ToggleButton disabled={!this.props.previousSessions || !this.props.previousSessions.length} onClick={this.showByQuestionScoreFilter} value={4}>Filter by Question Score</ToggleButton>
           </ToggleButtonGroup>
         </ButtonToolbar>
-        <br />
+
+        {this.state.selectionByQuestionScoreEnabled &&
+          <div style={{"padding-bottom": "20px"}}>
+            <InputGroup style={{"padding-bottom": "10px"}}>
+              <DropdownButton defaultValue="1" componentClass={InputGroup.Button} id="input-dropdown" title={this.state.filterType === FilterType.LessEqual ? "Less Equal" : "Greater Equal"}>
+                <MenuItem onClick={this.setFilterToLessEqual} key="1">Less Equal</MenuItem>
+                <MenuItem onClick={this.setFilterToGreaterEqual} key="2">Greater Equal</MenuItem>
+              </DropdownButton>
+              <FormControl type="number" value={this.state.filterValue} onChange={this.setFilterValue} />
+            </InputGroup>
+            <Button onClick={this.selectByQuestionScore}>Apply</Button>
+          </div>
+        }
+
         {
           this.props.questions.map(q => <QuestionSelection key={q.id} question={q} isSelected={this.props.selectedQuestions[q.id]} onSelectionChange={this.props.onSelectionChange} />)
         }
diff --git a/src/components/SessionRecap.tsx b/src/components/SessionRecap.tsx
index 77426c6..3479ae1 100644
--- a/src/components/SessionRecap.tsx
+++ b/src/components/SessionRecap.tsx
@@ -71,8 +71,8 @@ export default class SessionRecap extends React.PureComponent<SessionRecapProps,
               datasets: [{
                 label: `Session Score`,
                 borderWidth: 1,
-                backgroundColor: ['#008000', '#FF6384'],
-                hoverBackgroundColor: ['#008000', '#FF6384'],
+                backgroundColor: ['#008000', '#FF0000'],
+                hoverBackgroundColor: ['#008000', '#FF0000'],
                 data: [correctAnswerCount, incorrectAnswerCount]
               }]
             }}