Tag Improvement - Stop code duplication (fixing  STORE-108)