adding in pagination and finessing search