fixed map and api