Handle map before cafes and cafes before map issue