fixing tag saving
add more support for encryption
Merge branch 'IsolateFunctionality' of https://github.com/artieac/AlwaysMoveForward into IsolateFunctionality