map + results logic update