Changes to accommodate free-form search pages.