Merge "Increase parity between api search and on-wiki search"