Tweaked problem with non-search pages