diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 8b5dc60..4bf2410 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -177,7 +177,9 @@ class ConferencesController < ApplicationController
 		# Use callbacks to share common setup or constraints between actions.
 		def set_conference
 			@conference = nil
-			if type = ConferenceType.find_by!(slug: params[:conference_type_slug] || 'bikebike')
+			puts ' ---------------------- '
+			puts params
+			if type = ConferenceType.find_by!(slug: params[:conference_type] || params[:conference_type_slug] || 'bikebike')
 				if @conference = Conference.find_by!(slug: params[:conference_slug] || params[:slug], conference_type_id: type.id)
 					set_conference_registration
 				end
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index d8441c6..162f35e 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -4,4 +4,4 @@
 = tabs!
 
 %h2=('About '+@conference.title)
-%p=@conference.info
\ No newline at end of file
+%p=@conference.info.html_safe
\ No newline at end of file