CR fixes for automated cross-wiki search tests