improve folding out of stops
adapt Ambiguous Location Activity to the rest