diff --git a/cutprogress.py b/cutprogress.py
index 1d8a238674ab8be87ef6957564592d696d515035..b9e84ba116d0da66311b5551b831fc7c82ace9e3 100644
--- a/cutprogress.py
+++ b/cutprogress.py
@@ -40,8 +40,8 @@ def cutprogress(user=None):
 				lectures.course_id,
 				lectures.time,
 				lectures.title,
-				video_counts.videos_total,
-				video_counts.videos_visible
+				COALESCE(video_counts.videos_total, 0),
+				COALESCE(video_counts.videos_visible, 0)
 			FROM lectures
 			JOIN courses ON ( courses.id = lectures.course_id )
 			LEFT JOIN (
diff --git a/jobs.py b/jobs.py
index b858365d4fc9d659c2c5dd1232816dd1d2cfec83..82bdd3ff436ba80d6949ace2d72f1f2bc903d055 100644
--- a/jobs.py
+++ b/jobs.py
@@ -27,7 +27,7 @@ def jobs_overview():
 
 	condition_values = []
 	if filter['worker'] == '%':
-		condition = 'WHERE (type like ?) AND (worker IS NULL) AND (state like ?)'
+		condition = 'WHERE (type like ?) AND (state like ?)'
 		condition_values.extend([filter['type'], filter['state']])
 	else:
 		condition = 'WHERE (type like ?) AND (worker like ?) AND (state like ?)'