Fix bugs with cycling through POIs.