Simplify the search form and add pagination