diff --git a/tracks/app/controllers/application.rb b/tracks/app/controllers/application.rb
index 1972ffd0..084ed171 100644
--- a/tracks/app/controllers/application.rb
+++ b/tracks/app/controllers/application.rb
@@ -30,4 +30,8 @@ class ApplicationController < ActionController::Base
     error_messages_for( obj ) unless instance_eval("@#{obj}").nil?
   end
   
+  def deurlize(name)
+    name.to_s.gsub(/_/, " ")
+  end
+  
 end
\ No newline at end of file
diff --git a/tracks/app/controllers/context_controller.rb b/tracks/app/controllers/context_controller.rb
index ab4f3f47..f939248e 100644
--- a/tracks/app/controllers/context_controller.rb
+++ b/tracks/app/controllers/context_controller.rb
@@ -24,7 +24,7 @@ class ContextController < ApplicationController
 	# e.g. <home>/project/show/<project_name> shows just <project_name>.
 	#
 	def show
-	  @context = Context.find_by_name(@params["name"].humanize)
+	  @context = Context.find_by_name(deurlize(@params["name"]))
 	  @places = Context.find(:all, :order => "position ASC")
 	  @projects = Project.find(:all, :order => "position ASC")
 	  @page_title = "TRACKS::Context: #{@context.name}"
diff --git a/tracks/app/controllers/project_controller.rb b/tracks/app/controllers/project_controller.rb
index 29960fc1..7b9636b0 100644
--- a/tracks/app/controllers/project_controller.rb
+++ b/tracks/app/controllers/project_controller.rb
@@ -24,7 +24,7 @@ class ProjectController < ApplicationController
   # e.g. <home>/project/show/<project_name> shows just <project_name>.
   #
 	def show
-    @project = Project.find_by_name(@params["name"].humanize)
+    @project = Project.find_by_name(deurlize(@params["name"]))
     @places = Context.find(:all, :order => "position ASC")
     @projects = Project.find(:all, :order => "position ASC")    
     @page_title = "TRACKS::Project: #{@project.name}"
diff --git a/tracks/app/helpers/application_helper.rb b/tracks/app/helpers/application_helper.rb
index a3d679d2..bfdd012b 100644
--- a/tracks/app/helpers/application_helper.rb
+++ b/tracks/app/helpers/application_helper.rb
@@ -28,7 +28,7 @@ module ApplicationHelper
 	end
 
   def urlize(name)
-      name.to_s.gsub(/ /, "_").downcase
+      name.to_s.gsub(/ /, "_")
   end
 	
 	
diff --git a/tracks/db/tracks_1.0.3_content.sql b/tracks/db/tracks_1.0.3_content.sql
index 53681ae9..7c3a4512 100644
--- a/tracks/db/tracks_1.0.3_content.sql
+++ b/tracks/db/tracks_1.0.3_content.sql
@@ -11,7 +11,7 @@
 -- ------------------------------------------------------------
 
 INSERT INTO contexts (id,name,hide, position) VALUES (1,'agenda',0, 1);
-INSERT INTo contexts (id,name,hide, position) VALUES (2,'call',0, 2);
+INSERT INTO contexts (id,name,hide, position) VALUES (2,'call',0, 2);
 INSERT INTO contexts (id,name,hide, position) VALUES (3,'email',0, 3);
 INSERT INTO contexts (id,name,hide, position) VALUES (4,'errand',0, 4);
 INSERT INTO contexts (id,name,hide, position) VALUES (5,'lab',0, 5);