added base36 refs
Merge branch 'refactor-forum'