diff --git a/taskwarrior/.config/sh/env.d/taskwarrior-xdg.sh b/taskwarrior/.config/sh/env.d/taskwarrior-xdg.sh
index 9979553..1d75474 100644
--- a/taskwarrior/.config/sh/env.d/taskwarrior-xdg.sh
+++ b/taskwarrior/.config/sh/env.d/taskwarrior-xdg.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env sh
 
-export TASKRC="$XDG_CONFIG_HOME/task/taskrc"
-
 [ -d "$XDG_DATA_HOME/task/notes" ] || mkdir -p "$XDG_DATA_HOME/task/notes"
diff --git a/taskwarrior/.config/task/taskrc b/taskwarrior/.config/task/taskrc
index 6283fd9..9d2c92b 100644
--- a/taskwarrior/.config/task/taskrc
+++ b/taskwarrior/.config/task/taskrc
@@ -10,7 +10,7 @@
 # Use the command 'task show' to see all defaults and overrides
 
 # Files
-data.location=~/.local/share/task
+data.location=$XDG_DATA_HOME/task/
 
 # disable case sensitivity
 search.case.sensitive=no
@@ -35,10 +35,10 @@ report.next.columns=id,project,priority,urgency,due,description,tags,scheduled,e
 report.next.labels=,Project,Pri,Urg,Due,Description,Tags,Sched,Age,Recur
 
 # customize overdue report: hide tasks which are due today, but scheduled for 00:00:00
-report.overdue.filter=(status:pending or status:waiting) and +OVERDUE and -TODAY
+report.overdue.filter=(status:pending or +WAITING) and +OVERDUE and -TODAY
 # custom today report, sorted by urgency
 report.today.description=Tasks scheduled for today, sorted by urgency
-report.today.filter=status:pending +TODAY limit:page
+report.today.filter=status:pending -WAITING +TODAY limit:page
 report.today.sort=urgency-
 report.today.columns=id,project,priority,urgency,due,description,tags,scheduled,entry.age,recur
 report.today.labels=,Project,Pri,Urg,Due,Description,Tags,Sched,Age,Recur
@@ -96,5 +96,6 @@ report._reviewed.sort=reviewed+,modified+
 report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
 
 # different life contexts
-context.personal= project.hasnt:arbeit
-context.arbeit= project:arbeit
+context.arbeit.read=project:arbeit
+context.arbeit.write=project:arbeit
+context.personal.read=project.hasnt:arbeit