Fix for empty urldomain on marks/edit page
Merge branch '47-security-fixes'