(Bug 46466) Fix removed underscores in site id

A fix in ItemByTitle that should only strip underscores in "page"
also strips underscores in "site". That makes some language code
fail, and then the page lookup fail.

This is not properly tested yet.

Change-Id: I61acaeabdf44d80dde9b129c4de51e10e4004cd8