Upstream matching on page title

Actually from Alexey.

Refs #20