[ak] trying to clean up errors
[ak] Fixed the tags being deleted problem
[ak] Cleanup
[ak] Review changes
[ak] Merged