Improve friends detection