add map support and clean miami beach api callw