improved tour guide handling