WIKI-193: Fix js problems after merging