Add tags for popups, popups for messages