Source API name/ID cleaning issue #354
Merge pull request #423 from asobolev/master

Source API name/ID cleaning issue #354
Tag, MTag, EWSources API name/ID cleaning issue #354
some refactoring to fix comments
Merge pull request #424 from asobolev/master

Tag, MTag, EWSources API name/ID cleaning issue #354