CR fixes, changed overriding tags with adding tags