Improve category handle and title matching, to ensure that no page with
same name gets in the way