diff --git a/src/com/chschmid/jdotxt/gui/controls/JdotxtFilterPanel.java b/src/com/chschmid/jdotxt/gui/controls/JdotxtFilterPanel.java
index 9b78cec..ae53779 100644
--- a/src/com/chschmid/jdotxt/gui/controls/JdotxtFilterPanel.java
+++ b/src/com/chschmid/jdotxt/gui/controls/JdotxtFilterPanel.java
@@ -49,7 +49,7 @@ public class JdotxtFilterPanel extends JPanel {
 	public static final short  VISIBILITY_CONTEXTS = 2;
 	public static final short  VISIBILITY_ALL      = VISIBILITY_PROJECTS + VISIBILITY_CONTEXTS;
 	
-	public static final int DEFAULT_WIDTH = 150;
+	public static final int DEFAULT_WIDTH = 250;
 	
 	private TaskBag taskBag;
 	
diff --git a/src/com/todotxt/todotxttouch/task/ContextParser.java b/src/com/todotxt/todotxttouch/task/ContextParser.java
index f5398ed..9c532bf 100644
--- a/src/com/todotxt/todotxttouch/task/ContextParser.java
+++ b/src/com/todotxt/todotxttouch/task/ContextParser.java
@@ -30,7 +30,7 @@
 
 class ContextParser {
 	private final static Pattern CONTEXT_PATTERN = Pattern
-			.compile("(?:^|\\s)@(\\w+)", Pattern.UNICODE_CHARACTER_CLASS);
+			.compile("(?:^|\\s)@([\\w_\\.\\-\\:\\/]+)", Pattern.UNICODE_CHARACTER_CLASS);
 	private static final ContextParser INSTANCE = new ContextParser();
 
 	private ContextParser() {
diff --git a/src/com/todotxt/todotxttouch/task/ProjectParser.java b/src/com/todotxt/todotxttouch/task/ProjectParser.java
index 2c6be9b..f8c6a78 100644
--- a/src/com/todotxt/todotxttouch/task/ProjectParser.java
+++ b/src/com/todotxt/todotxttouch/task/ProjectParser.java
@@ -30,7 +30,7 @@
 
 class ProjectParser {
 	private final static Pattern CONTEXT_PATTERN = Pattern
-			.compile("(?:^|\\s)\\+(\\w+)", Pattern.UNICODE_CHARACTER_CLASS);
+			.compile("(?:^|\\s)\\+([\\w_\\.\\-\\:\\/]+)", Pattern.UNICODE_CHARACTER_CLASS);
 	private static final ProjectParser INSTANCE = new ProjectParser();
 
 	private ProjectParser() {