BOOK-531 fix for displaying available tasks and remove some commented template code
merging, not totally sure what is happening