make wikiasearchindexer respect canonical page id
fix method typo
fix some logic that made internal break during search
Merge branch 'canonicalfix' into dev