CON-1016 | Fixes for create-a-wiki button and some leftovers
CON-1016 | cr changes