Topic Tag: custom data Improvements