improving map endpoints