[#24]: Tag domain data
[#26],[#23]: Some fix for test cases