Reverted back to proper taglist generator