Fixed some tagging logic (no saving yet)