Update map with highligh layers, make them work