Fix replacing of listings when one has no location yet.
Fix layout.
Add the posibility to disambiguate alternatives.
Small code simplifications.