Ticket #24331 - Fix for missing tags.