Removing separate search page handler / URLs