Renamed files for more generic search.  Fixed pagination