ip and agent info on location suggestions
Merge branch 'enhancements'