Clipped result list to 10. Bug fixes for scanner