Fixed some bugs concerning additional tags
Authored by: mikebeblack 2011-02-19
Parent: [r96]
Child: [r98]