diff --git a/app.py b/app.py
index ebca410..67d586a 100644
--- a/app.py
+++ b/app.py
@@ -188,16 +188,16 @@ def get_workout_start_date(person_id, workout_id):
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>", methods=['GET'])
 @ validate_topset
 def get_topset(person_id, workout_id, topset_id):
-    topset = db.get_topset(person_id, workout_id, topset_id)
-    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercise_id=topset['ExerciseId'], exercise_name=topset['ExerciseName'], repetitions=topset['Repetitions'], weight=topset['Weight'])
+    topset = db.get_topset(topset_id)
+    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercise_id=topset['exercise_id'], exercise_name=topset['exercise_name'], repetitions=topset['repetitions'], weight=topset['weight'])
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>/edit_form", methods=['GET'])
 @ validate_topset
 def get_topset_edit_form(person_id, workout_id, topset_id):
     exercises = db.get_all_exercises()
-    topset = db.get_topset(person_id, workout_id, topset_id)
-    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercises=exercises, exercise_name=topset['ExerciseName'], repetitions=topset['Repetitions'], weight=topset['Weight'], exercise_id=topset['ExerciseId'], is_edit=True)
+    topset = db.get_topset(topset_id)
+    return render_template('partials/topset.html', person_id=person_id, workout_id=workout_id, topset_id=topset_id, exercises=exercises, exercise_id=topset['exercise_id'], exercise_name=topset['exercise_name'], repetitions=topset['repetitions'], weight=topset['weight'], is_edit=True)
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset", methods=['POST'])
@@ -282,7 +282,7 @@ def get_exercise(exercise_id):
 @ app.route("/exercise/<int:exercise_id>/edit_form", methods=['GET'])
 def get_exercise_edit_form(exercise_id):
     exercise = db.get_exercise(exercise_id)
-    return render_template('partials/exercise.html', exercise_id=exercise_id, name=exercise.name, is_edit=True)
+    return render_template('partials/exercise.html', exercise_id=exercise_id, name=exercise['name'], is_edit=True)
 
 
 @ app.route("/exercise/<int:exercise_id>/update", methods=['PUT'])
diff --git a/db.py b/db.py
index 7d2d99a..d08e0a1 100644
--- a/db.py
+++ b/db.py
@@ -227,37 +227,24 @@ class DataBase():
             'Note': note
         }
 
-    def get_topset(self, person_id, workout_id, topset_id):
+    def get_topset(self, topset_id):
         topset = self.execute("""
             SELECT
-                P.person_id AS "PersonId",
-                P.name AS "PersonName",
-                W.workout_id AS "WorkoutId",
-                W.start_date AS "StartDate",
-                T.topset_id AS "TopSetId",
-                E.exercise_id AS "ExerciseId",
-                E.name AS "ExerciseName",
-                T.repetitions AS "Repetitions",
-                T.weight AS "Weight"
-            FROM Person P
-                INNER JOIN Workout W ON P.person_id=W.person_id
-                INNER JOIN TopSet T ON W.workout_id=T.workout_id
+                T.topset_id,
+                E.exercise_id,
+                E.name AS "exercise_name",
+                T.repetitions,
+                T.weight
+            FROM TopSet T 
                 INNER JOIN Exercise E ON T.exercise_id=E.exercise_id
-            WHERE P.person_id=%s
-                AND W.workout_id = %s
-                AND T.topset_id = %s""", [person_id, workout_id, topset_id], one=True)
+            WHERE T.topset_id = %s""", [topset_id], one=True)
 
         return {
-            'PersonId': topset['PersonId'],
-            'PersonName': topset['PersonName'],
-            'WorkoutId': workout_id,
-            'StartDate': topset['StartDate'],
-            'Exercises': self.get_all_exercises(),
-            "TopSetId": topset['TopSetId'],
-            "ExerciseId": topset['ExerciseId'],
-            "ExerciseName": topset['ExerciseName'],
-            "Weight": topset['Weight'],
-            "Repetitions": topset['Repetitions']
+            "topset_id": topset['topset_id'],
+            "exercise_id": topset['exercise_id'],
+            "exercise_name": topset['exercise_name'],
+            "weight": topset['weight'],
+            "repetitions": topset['repetitions']
         }
 
     def get_all_topsets(self):