improved search, using pagination