Fix map search + put icons in a map + code cleanup