Clean up the search interface and add page paramater