Improve results map