BOOK-531 fix for displaying available tasks

And remove some commented template code