Nameing of sources implemented
Bugfix in tagging