endpoint change and map fix