Added Tags persist code
Tags persist code, merge