Improved labelling of sources in popups

Solves the "duplicate lemma" problem.