LPS-34517 Fix more errors with expando in wiki (includes tests :)