#234 Fix unsafe generation of task listing
Merge pull request #236 from drexin/wip-234-fix-tasks-listing-drexin

#234 Fix unsafe generation of task listing