added more "composite tags"

total coverage: 50.21 %