diff --git a/templates/quest.html b/templates/quest.html
index 72d204c..95e2be2 100644
--- a/templates/quest.html
+++ b/templates/quest.html
@@ -253,15 +253,17 @@
 							<col{% if quest_post[0] != open_post_id %} style="visibility: collapse;"{% endif %}/>
 							<col/>
 							<col/>
-							{% for option in quest_post[0]|get_options %}
+							{% for option in options %}
+							{% if option[1] == quest_post[0] %}
 							<tr>
 								<td class="pollCheckBox">
 									<input type="checkbox" id="pollInput-{{ option[0] }}" onchange="pollVote({{ option[0] }})"/>
 									<label for="pollInput-{{ option[0] }}"></label>
 								</td>
 								<td class="option_text">{{ option[2] }}</td>
-								<td class="optionVotes">{{ option[0]|num_votes }}</td>
+								<td class="optionVotes">0</td>
 							</tr>
+							{% endif %}
 							{% endfor %}
 						</table>
 						{% endif %}
diff --git a/views.py b/views.py
index 77083cc..e232784 100644
--- a/views.py
+++ b/views.py
@@ -59,10 +59,8 @@ def quest(quest_title):
 	open_post_id = data[4]
 
 	quest_posts = db.get_quest_data(quest_id)
-	#dice_rolls = db.get_dice_rolls(quest_id)
-	#polls = db.get_polls(quest_id)
-	#polls = {poll[0]: poll[1:] for poll in polls}
-
+	dice_rolls = db.get_dice_rolls(quest_id)
+	options = db.get_poll_options(quest_id=quest_id)
 	messages = db.get_chat_messages(quest_id)
 
 	temp = render_template('quest.html', **locals())