Refactor tour details map