Syntax fixes from add_class.  Base Wiki Result, Web and Rest.