Fixes for comments by @lislis

* can't get rid of the template thingy, breaks stuff - for real!
Merge branch 'master' into list_for_non_members