fixed issue where when applying a new tag, unselected items would be overwritten as well
fixed merge conflict
Merge branch 'activedev' of https://github.com/WheatonCS/Lexos into activedev