Updates to fix wikipage handler