Settings: refactor structure for Tag data