Clean up Search in Pageview to fix #48.